Commit graph

629 commits

Author SHA1 Message Date
jbeisner
acd7d01676 Add height to the 'FailureRestartText' 2019-08-26 15:39:30 -07:00
William Li
f1c62d315e Correct branding 2019-08-23 13:41:03 -07:00
William Li
032926e8fc 3.1.1xx branding 2019-08-21 18:51:43 -07:00
Livar
b830442d62
Updating release/3.0.1xx branding to rc1. 2019-08-20 14:07:50 -07:00
John Beisner
fd4ebe6d48
Merge pull request #4069 from johnbeisner/VS-ARP-PlaceHolder
SDK ARP Placeholder for Visual Studio
2019-08-19 17:23:34 -07:00
jbeisner
daee0c40db Updates per code review. 2019-08-19 11:15:40 -07:00
jbeisner
c3ae4a64a8 Updates per code review. 2019-08-16 21:54:47 +00:00
jbeisner
9fe66e5c0f Adding 'ARPNOREPAIR' 2019-08-16 19:24:07 +00:00
jbeisner
e367a32ce4 Introducing a SDK ARP Placeholder for Visual Studio 2019-08-16 18:56:20 +00:00
Zbyněk Sailer
3c07d89244 LOC CHECKIN | dotnet/core-sdk master | 20190813 (#3982) 2019-08-15 10:17:08 -07:00
jbeisner
2d53cf29ec Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:43 -07:00
jbeisner
f797953741 Removing the RelativeLayoutPath: "shared" for the WinForms and Wpf ArchiveFile 2019-08-09 12:10:40 -07:00
Nick Guerrera
c37db568fe
Remove unused variables from bundled versions (#3742)
These are replaced by the ImplicitPackageReferenceVersion items, and were mostly removed from 2.x:  

4158f5e94f
2019-08-09 09:09:39 -07:00
jbeisner
c820b75ae8 Fixing a typo... 2019-08-08 12:37:16 -07:00
jbeisner
562adf13ea Updating the .NET Core installer welcome message. 2019-08-08 08:50:50 -07:00
Nick Guerrera
aca24e4ecb Fix RHEL test failure 2019-08-07 13:02:21 -07:00
jbeisner
a489af6341 Updating link; "Core" change to ".NET Core" 2019-08-06 09:12:39 -07:00
Nick Guerrera
81100b05d2 Use *.5.0 template packages 2019-08-05 15:12:49 -07:00
Nick Guerrera
ac2000cc03 Add netcoreapp5.0 support to bundled versions
* Use 3.0-preview7 when targeting netcoreapp3.0 with 5.0 SDK for now
* Update known app host packs and framework references to 5.0
* Remove workaround for fixed bug from tests
* Temporarily expect run failure while templates are still at 3.0
2019-08-02 22:19:00 -07:00
John Beisner
15fcfc5c6f
Merge pull request #3624 from johnbeisner/TemplateNupkgVersioning
Standardize 2.1/2.2/3.0 templates NuPkg version
2019-07-31 08:06:19 -07:00
Daniel Plaisted
c5a57d5805
Merge pull request #3576 from dsplaisted/crossgen-sdktasks
Fix crossgen for SDK tasks and native image symbol publishing
2019-07-30 18:09:46 -07:00
jbeisner
648c78a01e Use the SDK version as the NuPkg version for templates; remove superfluous WiX logic in the templates' MSI 2019-07-30 21:50:31 +00:00
Daniel Plaisted
446a3dc389 Change directory for native PDBs, so arcade should pick them up for publishing 2019-07-29 18:14:22 -07:00
Daniel Plaisted
3435d946ed Fix crossgen'ing .NET SDK build tasks 2019-07-29 18:13:54 -07:00
Livar
21de391bc1
Updating branding to preview9 2019-07-29 10:33:54 -07:00
Livar
67910f5e07
Updating branding to 5.0.100-alpha1 2019-07-28 12:06:50 -07:00
John Beisner
a3af2c43a5
Merge pull request #3383 from johnbeisner/TemplatesUpdate
Adding 2.1 and 2.2 Templates MSIs
2019-07-24 13:49:56 -07:00
Nick Guerrera
d1f57e32ce
Don't include WindowsDesktop targeting pack in x-plat tarball (#3403) 2019-07-24 11:02:42 -07:00
jbeisner
75e5139fe1 Merging master and resolving conflicts. 2019-07-24 16:14:47 +00:00
jbeisner
67c7c446f9 Updates per code review 2019-07-24 16:08:11 +00:00
jbeisner
249af0f120 Updates per code review. 2019-07-24 03:32:47 +00:00
Daniel Plaisted
5a590771e5
Merge pull request #2970 from dsplaisted/remove-legacyframeworkpackages
Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference
2019-07-23 18:58:27 -07:00
jbeisner
b95848906a Fixing the 3.0 template conditional; adding a comment. 2019-07-24 00:41:46 +00:00
jbeisner
aacd4f6179 Updating 3.0 template variables. 2019-07-24 00:18:21 +00:00
jbeisner
14ef11f030 Formatting... 2019-07-22 22:31:48 +00:00
jbeisner
f31451cbc0 Minor updates to variable names 2019-07-22 22:26:51 +00:00
jbeisner
f55ddb8a15 Adding 2.1 and 2.2 Templates MSIs, part 3 2019-07-22 17:06:16 +00:00
jbeisner
4de1b875e5 Adding 2.1 and 2.2 Templates MSIs, part 2 2019-07-22 15:55:23 +00:00
jbeisner
49ad1e8dd5 Adding 2.1 and 2.2 Templates MSIs, part 1 2019-07-17 23:18:41 +00:00
John Beisner
a5630932ee
Merge pull request #3201 from johnbeisner/TemplateMSIs
Generate a MSI for templates and move templates to dotnet/Templates
2019-07-17 08:28:28 -07:00
Livar Cunha
34a888c02f Fixing the condition for when we do a build without a suffix (final branding). 2019-07-15 17:22:56 -07:00
Livar Cunha
5475a81a55 Switch to lower case t (templates) for the folder name under dotnet. 2019-07-15 10:25:17 -07:00
Livar Cunha
c35bcd49af Adding new templates folder to pkg native installer.
Moved templates folder under dotnet to Templates (capital T) and added dotnet/Templates to the deb installer.

Adding Templates to the sdk rpm native installer.
2019-07-14 22:21:30 -07:00
Livar Cunha
3247485b57 Re-enable the generation of the msbuildextensions nupkg. 2019-07-12 15:05:32 -07:00
jbeisner
e2eb862efb Creating a Windows MSI for templates. 2019-07-11 00:43:29 +00:00
Livar
192b7945f0
Update implicit versions for self-contained apps for 2.1 and 2.2 2019-07-09 14:51:56 -07:00
Daniel Plaisted
fec1bb4f16 Remove PackagesToReference metadata from Microsoft.NETCore.App KnownFrameworkReference 2019-07-08 16:00:33 -07:00
dotnet-maestro[bot]
eccec24551
[master] Update dependencies from aspnet/AspNetCore (#2811)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190708.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0-preview8.19358.2
- Microsoft.AspNetCore.App.Ref - 3.0.0-preview8.19358.2
- dotnet-watch - 3.0.0-preview8.19358.2
- dotnet-user-secrets - 3.0.0-preview8.19358.2
- dotnet-dev-certs - 3.0.0-preview8.19358.2

* React to SPA template rename
2019-07-08 18:20:32 +00:00
jbeisner
9ec2da3408 Branding update to "preview8" 2019-07-02 00:13:44 +00:00
dotnet-maestro[bot]
76797cc920
[master] Update dependencies from dotnet/arcade (#2667)
* Update dependencies from https://github.com/dotnet/arcade build 20190626.44

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19326.44

* Add missing feed

* Use PackageDownload

* Update dependencies from https://github.com/dotnet/arcade build 20190627.39

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19327.39

* Use new apphost package and stop downloading extra packages
2019-06-28 13:15:43 +00:00
Chris Rummel
6962cd30c5 Allow specifying CoreSetupRid. 2019-06-25 12:08:51 -07:00
Chris Rummel
64ba96eac4 Don't copy over packages if there are no packages to copy. 2019-06-25 12:08:26 -07:00
Chris Rummel
194cdca506 Don't reset blob URL if we pass it in. 2019-06-25 12:08:11 -07:00
Livar
5d80f38dba
Merge pull request #2005 from dotnet/darc-master-33a78994-1ff6-4b93-90fb-cbd9502e5547
[master] Update dependencies from dotnet/arcade
2019-06-18 16:52:59 -07:00
Parallels
eb29f40037 Fixing the property we use in the DotnetDebTool to get the path to a stage0 dotnet. 2019-06-18 16:38:26 -07:00
John Beisner
945767a2a2
Addressing VS signing errors. (#2500) 2019-06-18 06:49:09 -07:00
Nate McMaster
c3eb847334
Add linux-musl-arm64 to list of supported AspNetCore runtimes (#2441) 2019-06-12 13:42:09 -07:00
John Beisner
4c3683314b
Rename: "VS.Redist.Common.Net.Core.Toolset" -> "VS.Redist.Common.NetCore.Toolset" (#2403) 2019-06-11 13:16:26 -07:00
Daniel Plaisted
5293e96d5a
Merge pull request #2401 from dsplaisted/update-runtime-packs
Update runtime pack names
2019-06-10 17:57:09 -07:00
Daniel Plaisted
da3a92ae63 Remove unused apphost metadata from KnownFrameworkReference 2019-06-10 17:29:39 -07:00
John Beisner
1e7815b2dd
Produce Toolset MSI NuPkgs for insertion into VS (#2359)
* Produce Toolset MSI NuPkgs for insertion into VS; stop producing SDK bundle NuPkgs.
2019-06-10 16:00:53 -07:00
Daniel Plaisted
8aff01947a Update runtime pack names 2019-06-10 15:32:28 -07:00
Daniel Plaisted
e5275d990f Add KnownFrameworkReference items for WPF and WindowsForms profiles 2019-06-03 19:01:54 -07:00
William Li
b47d352a48 Update branding to preview 7 2019-06-02 19:35:45 -07:00
Peter Huene
565e0d9b06
Update Microsoft.WindowsDesktop.App to mark as "Windows only".
This commit marks the `Microsoft.WindowsDesktop.App` known framework reference
as Windows only.  This will be used by a upcoming SDK change to ensure that
"Windows only" frameworks can only be used on Windows.
2019-05-30 17:35:20 -07:00
Nate McMaster
a0107cdb1d
Remove workaround for aspnet/AspNetCore#8835 (#2170)
* Remove workaround for aspnet/AspNetCore#8835

* Update GenerateLayout.targets

* Update ASP.NET Core to 3.0.0-preview6-19279-08
2019-05-30 10:48:46 -07:00
Peter Huene
33815f75c9
Remove Windows Desktop project templates for non-Windows.
This commit removes the Windows Desktop project templates for non-Windows
builds of the .NET Core SDK.

Fixes dotnet/cli#11425.
2019-05-29 19:06:11 -07:00
John Beisner
6392d02bf3
Updating some translations... (#2194) 2019-05-29 11:56:22 -07:00
John Beisner
808359df16
Increasing the SDK bundle installer button size 20-px (#2123)
* Increasing the SDK bundle installer button size 20-px
2019-05-24 15:24:24 -07:00
John Beisner
f55dd40436
Omit nupkgs and related files in the SDK bundle. (#2030) 2019-05-16 16:33:49 -07:00
John Beisner
d987a525c8
Resolve named CAB collision and drop the CABs (#1976)
* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
2019-05-16 16:33:29 -07:00
John Beisner
8ae3afa572
Updating projectUrl values from "cli" to "core-sdk" (#1800) 2019-05-16 16:32:26 -07:00
Nate McMaster
d30a9f5c83
Remove dotnet-sql-cache from the CLI (#2014) 2019-05-16 07:49:25 -07:00
Daniel Plaisted
865f1c2745
Merge pull request #1992 from sbomer/isTrimmable
Mark Microsoft.NETCore.App as trimmable
2019-05-15 16:31:10 -07:00
Sven Boemer
39212e1699 Define NetCoreRoot (#1997)
This will be used by the SDK to locate the dotnet host when running in
desktop msbuild. Necessary for tools that always run on .NET Core,
like the IL Linker.
2019-05-15 14:24:56 -07:00
John Beisner
b0f2205264
Adding localization to the Windows SDK bundle installers (#1996)
* Adding localization to the Windows SDK bundle installers
2019-05-15 12:51:44 -07:00
Livar Cunha
6e33b6e3de Fix implicit versions for self-contained apps. Updated versions to 1.0.16, 1.1.13, 2.1.11 and 2.2.5. 2019-05-14 11:23:04 -07:00
Sven Boemer
8c81543eb5 Mark Microsoft.NETCore.App as trimmable
The SDK will be updated to flow this metadata to resolved dlls,
influencing the default linker behavior.
2019-05-14 08:45:50 -07:00
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Daniel Plaisted
8bcd7ee623 Add PackagesToReference metadata to KnownFrameworkReference
The SDK will consume this to generate PackageReferences to "empty" packages such as Microsoft.NETCore.App
2019-04-26 08:47:25 -07:00
Daniel Plaisted
44f0335886
Merge pull request #1765 from dsplaisted/remove-runtimepack-internal
Don't use .Internal suffix for runtime packs
2019-04-26 08:30:45 -07:00
Daniel Plaisted
de6f99b7ad Don't use .Internal suffix for runtime packs
This was removed with https://github.com/dotnet/core-setup/pull/6096
2019-04-26 08:14:05 -07:00
John Beisner
fe905c81da
SDK bundle UI modifications (#1756)
* SDK bundle UI modifications.
2019-04-26 08:06:14 -07:00
Daniel Plaisted
f21fc9c2ba
Merge pull request #1748 from dsplaisted/use-internal-netcoreapp-package
Switch to  .Internal insertion package for .NET Core
2019-04-25 11:18:30 -07:00
Daniel Plaisted
27be26f712 Switch to .Internal insertion package for .NET Core 2019-04-25 08:51:39 -07:00
John Beisner
ca9216c97d
[WIP] Removal of additional package feeds set by default (#1561)
Removal of additional package feeds set by default
2019-04-23 10:33:16 -07:00
William Li
12b159311d Update branding to preview 6 2019-04-21 18:15:11 -07:00
Daniel Plaisted
3289119b23 Update apphost pack pattern 2019-04-19 10:54:35 -07:00
John Beisner
07b074acf7
adding .Net core AppHost pack (#1519)
* adding .Net core AppHost pack
2019-04-17 12:53:05 -07:00
Daniel Plaisted
9f998eabcd Switch to .Ref targeting pack for .NET Standard 2.1 2019-04-15 19:04:36 -07:00
dotnet-maestro[bot]
16daae1035
[master] Update dependencies from dotnet/core-setup (#1447)
* Update dependencies from https://github.com/dotnet/core-setup build 20190412.04

- Microsoft.NETCore.App - 3.0.0-preview5-27612-04
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-04
- NETStandard.Library.Ref - 2.1.0-preview5-27612-04

* Update dependencies from https://github.com/dotnet/core-setup build 20190412.06

- Microsoft.NETCore.App - 3.0.0-preview5-27612-06
- Microsoft.WindowsDesktop.App - 3.0.0-preview5-27612-06
- NETStandard.Library.Ref - 2.1.0-preview5-27612-06

* Updating 'windowsdesktop-runtime' asset names and blob paths.

* Updating the blob root...

* Updating the RID for 'windowsdesktop-runtime' archive.
2019-04-12 20:15:30 +00:00
John Beisner
0d4bdcd199
adding .Net standard 2.1 Targeting Packs (#1309)
* adding .Net standard 2.1 Targeting Packs
2019-04-10 08:55:46 -07:00
Nick Guerrera
28e5c54dfe Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-04-09 11:13:55 -07:00
Nick Guerrera
5c96d57220
[release/3.01xx] Bump latest 2.1/2.2 in bundled versions (#1307) 2019-04-09 11:06:05 -07:00
William Li
afb5778559 Update branding to preview5 2019-04-07 16:35:28 -07:00
William Li
6400435101
Merge pull request #1121 from bricelam/ef-no
Remove dotnet-ef
2019-04-04 11:00:46 -07:00
John Beisner
4f57f8e679
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer (#1173)
Adding the NetCoreApp and ASP.Net Targeting Packs to the native MacOS installer - PKG
* Add the ASP.Net Targeting Pack from an archive.
2019-04-02 15:51:47 -07:00
Brice Lambson
331c153709
Remove dotnet-ef
Resolves aspnet/EntityFrameworkCore#14016
2019-04-02 15:03:32 -07:00
John Beisner
7289df22ae
Update release notes link; MacOS (#1181)
Update release notes link; MacOS
2019-04-02 13:12:17 -07:00
John Beisner
10224a8d3b
Linux native installer updates: DEB and RPM (#1122)
Adding targeting packs to native Linux installers.
 * Re-enable RPM and DEB installation testing.
2019-04-01 14:24:56 -07:00
jbeisner
5cc5e58dc8 Accessibility Insights warnings: tab stops and bounds fix. 2019-03-25 19:24:50 +00:00
John Beisner
ab479d5ed5
Include the WindowsDesktop targeting pack MSI in the SDK bundle installation. (#1062) 2019-03-19 14:15:32 -07:00
Livar
4d0678083d
Merge pull request #673 from dotnet/merges/release/3.0.1xx-to-master
Merge release/3.0.1xx to master
2019-03-18 10:47:45 -07:00
Nick Guerrera
1763e0dc07
Set DOTNET_ROOT appropriately in internal build Init.cmd (#993) 2019-03-14 16:40:43 -07:00
John Beisner
df11eb9367
SDK bundle installer and Accessibility Insights warnings (#1012)
* Addressing Accessibility Insights warnings regarding the consideration of 'Image' and 'Text' tags having 'Name' attributes.
2019-03-14 08:44:39 -07:00
Nick Guerrera
ddc9c162ed
Don't exclude files starting with . from nupkgs (#994)
This was preventing `dotnet --info` and `dotnet --version` from working
in internal build scenario.
2019-03-12 18:39:16 -07:00
Livar Cunha
28f32808f8 Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/release/3.0.1xx-to-master
* upstream/release/3.0.1xx: (109 commits)
  Updating the implicit 1.0/1.1 runtime versions for self-contained apps.
  Update dependencies from https://github.com/dotnet/toolset build 20190312.2
  Update dependencies from https://github.com/dotnet/toolset build 20190312.1
  Update dependencies from https://github.com/dotnet/toolset build 20190311.5
  Update dependencies from https://github.com/dotnet/toolset build 20190311.4
  Update dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted build 20190311.38
  [release/3.0.1xx] Update dependencies from dotnet/toolset (#974)
  [release/3.0.1xx] Update dependencies from  1 repositories (#973)
  Update dependencies from https://github.com/dotnet/toolset build 20190311.1 (#972)
  [release/3.0.1xx] Update dependencies from  1 repositories (#926)
  Update dependencies from https://github.com/dotnet/standard build 20190308.1 (#939)
  Update dependencies from https://github.com/dotnet/core-setup build 20190309.01 (#935)
  [release/3.0.1xx] Update dependencies from dotnet/core-setup (#933)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.9 (#930)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.7 (#929)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.8 (#928)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.6 (#925)
  [release/3.0.1xx] Update dependencies from  1 repositories (#918)
  Update dependencies from https://github.com/dotnet/core-setup build 20190308.09 (#924)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.5 (#921)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
eng/common/generate-graph-files.ps1
global.json
src/redist/targets/GenerateBundledVersions.targets
2019-03-12 12:35:50 -07:00
Livar Cunha
facf810423 Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:26:26 -07:00
Livar Cunha
ae9a00dc2e Updating the implicit 1.0/1.1 runtime versions for self-contained apps. 2019-03-12 10:21:31 -07:00
dotnet-maestro[bot]
d72abce213 [release/3.0.1xx] Update dependencies from dotnet/toolset (#824)
* Update dependencies from https://github.com/dotnet/toolset build 20190304.4

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19154.4

* Pull toolset from new location
2019-03-04 09:03:03 -08:00
John Beisner
6aed0cd361
Fixing the SDK bundle installer's versioning. (#755) 2019-03-01 13:07:12 -08:00
John Beisner
7a40c294b8
Replace "MIT License" with ".NET Library EULA" in SDK bundle installer. (#757) 2019-03-01 13:06:49 -08:00
Livar Cunha
51323db8aa Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:50 -08:00
Livar Cunha
d81616de3e Undoing the 1.x implicit version changes. Those bits are not available in a feed yet. 2019-03-01 09:51:05 -08:00
Livar
35fa79bcdc Updating self-contained app implicit versions 2019-03-01 08:53:16 -08:00
Livar
651147ff49
Updating self-contained app implicit versions 2019-03-01 08:51:14 -08:00
Nate McMaster
49d8bc9941
Update SDK to use aspnet runtime packs (#754)
React to deprecation of Microsoft.AspNetCore.App.

Changes:
* Update KnownFrameworkReference to use the new runtime packs
* Stop reference Microsoft.AspNetCore.App
* Stop generating unused variable in the SDK: BundledAspNetCoreAppPackageVersion and BundledAspNetCoreAppTargetFrameworkVersion
* Add prodcon entries for all aspnet dependencies. These may not have the same version in the future (like patch updates)
2019-02-28 10:13:03 -08:00
Nick Guerrera
85ce55487a
Use WindowsDesktop.App.*Ref*, add more packs to .zip (#698) 2019-02-26 11:09:56 -08:00
Nick Guerrera
18101b4d6c Merge branch 'master' into merges/release/3.0.1xx-to-master 2019-02-23 08:21:25 -08:00
John Beisner
3172bcef35
Modify the 'InstallLocation' registry key. (#636)
Before = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>\sdk
After = SOFTWARE\dotnet\Setup\InstalledVersions\<arch>
2019-02-22 16:48:10 -08:00
Nate McMaster
5e940ca125
Replace aspnetcore-dev myget feed with dotnetfeed (#653) 2019-02-22 16:15:10 -08:00
Daniel Plaisted
d3a4753ef5 Merge release/3.0.1xx' into master 2019-02-21 14:33:02 -08:00
Nick Guerrera
557c5609d7
Fix typo in DOTNET_MULTILEVEL_LOOKUP in Init.cmd (#634) 2019-02-21 13:02:05 -08:00
Nick Guerrera
7ab11b8119
Add cxspec to overlay resolver on msbuild (#622) 2019-02-21 07:25:08 -08:00
Daniel Plaisted
faad6455bc Use .Ref targeting packs and include in layout under packs folder 2019-02-20 16:36:41 -08:00
John Beisner
703e3fd469
Include the targeting pack MSI in the SDK bundle installation (#588)
* Include the targeting pack MSI in the SDK bundle installation.
2019-02-20 16:36:11 -08:00
Daniel Plaisted
b122749d1f Fix .NET Standard targeting pack version 2019-02-20 09:27:45 -08:00
dotnet-maestro[bot]
b02292a944
[release/3.0.1xx] Update dependencies from dotnet/toolset (#596)
* Update dependencies from https://github.com/dotnet/toolset build 20190219.13

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.13

* Update dependencies from https://github.com/dotnet/toolset build 20190219.15

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.15

* Update dependencies from https://github.com/dotnet/toolset build 20190219.16

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.16

* In test projects, append to RestoreAdditionalProjectSources instead of replacing it

9ffae2ef94

* Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory

* Don't try to chmod RunFsc.sh that no longer exists
2019-02-20 08:07:45 +00:00
John Beisner
131cc45593
Enabling the upgrade of the SDK bundle in a product-band (#530)
* Enabling the 'upgrade' of the SDK bundle in a 'product-band'.
2019-02-19 14:21:54 -08:00
Nick Guerrera
39648da4dc
Add package with MSBuild SDK resolver for internal build consumption (#478)
* Add package with MSBuild SDK resolver for internal build consumption

* Fix `dotnet pack` of redist.csproj without having built everything first
2019-02-14 18:21:23 -08:00
Daniel Plaisted
5ce70fe86f Merge release/3.0.1xx into master 2019-02-13 09:59:07 -08:00
Daniel Plaisted
43f5bbf70c Update latest patch versions 2019-02-12 18:00:04 -08:00
Daniel Plaisted
25b7ea2285 Add bundled version information for targeting .NET Standard 2.1 2019-02-12 16:48:43 -08:00
William Li
9f9afa1f76 Remove chmod
Per https://github.com/Microsoft/visualfsharp/pull/5882
This file is no longer needed and removed
2019-02-10 20:48:37 -08:00
Livar Cunha
d134de74e8 Updating the branding to preview3 and adding the branch to CI. 2019-02-08 13:50:45 -08:00
Livar
a786b27938
Updating the branding to preview4 2019-02-08 13:47:14 -08:00
John Beisner
04f4a02a7c Update release notes permalink for 3.0 2019-02-08 00:39:34 +00:00
John Beisner
c378d31a21
Updating the SDK bundle's purple color to .Net core's latest branding (#389)
* Updating the SDK bundle's purple color to .Net core's latest branding.
* Updating per code review...
2019-02-06 10:52:56 -08:00
Daniel Plaisted
391a32838d Add KnownAppHost item 2019-02-01 14:16:53 -08:00
Livar Cunha
531200169f Updating the property name for toolset dependency uptake based on the fake package being published there. 2019-01-15 15:37:37 -08:00
Livar
14d2114d98
Merge pull request #276 from livarcocc/fix_linux_arm64_asp_runtime
We were not including asp.net on arm64 linux builds.
2019-01-11 16:33:52 -08:00
Livar Cunha
7526059d57 Asp.net is actually available in all platforms we support. Removing the condition on including asp.net's archive in our builds. 2019-01-11 16:09:55 -08:00
Livar
5ad3dfdf29
Merge pull request #275 from livarcocc/prepare_for_darc_toolset_update
Updating the toolset version property to match the package name publi…shed by dotnet/toolset repo.
2019-01-11 16:02:36 -08:00
Livar Cunha
6ac9c495a0 We were not including asp.net on arm64 linux builds. 2019-01-11 15:50:34 -08:00
Nick Guerrera
7522ad768a Move VS internal transport nupkgs to NonShipping
These nupkgs don't ship
2019-01-11 14:53:58 -08:00
Livar Cunha
9d6ed02444 Updating the toolset version property to match the package name published by dotnet/toolset repo. This allows for darc updates for toolset versions. 2019-01-11 14:32:52 -08:00
Nick Guerrera
d2491511e5 Generate nupkg of .NET Core SDK for internal build consumption
Also clean up a bunch of issues with the generatenupkg script:
* Output from nuget pack was getting lost
* Non-existent file was imported
* Literal '-ForegroundColor Green' was printed to the screen (didn't actually change the color)
* nuget.exe was being put inside the src/ tree, moved to artifacts/Tools/nuget
* Temporary nuspec was created unnecessarily, now use -Properties instead of search and replace
* Downgraded to nuget 3.5.0 to workaround a perf issue in nuget 4.x pack
2019-01-11 13:55:57 -08:00
Adam Yoblick
d47f13eb96 added windowsdesktop container to support new feed we're pushing packages to 2019-01-10 16:46:16 -06:00
Nick Guerrera
e4774f097b
Bump latest patch version for 2.1 and 2.2 (#254) 2019-01-08 17:37:10 -08:00
Sarabjot Singh
08912895ba Insertion for 3.0 test templates. 2019-01-08 13:43:34 +05:30
Daniel Plaisted
b1267bdc87 Use correct version of Microsoft.NETCore.App for calculating dependencies for bundled versions 2019-01-03 16:15:34 -08:00
Daniel Plaisted
2234a0182c Use more descriptive filename for runtime identifier graph file 2019-01-03 15:15:55 -08:00
Daniel Plaisted
0af7d1c187 Bundle runtime graph file in SDK 2019-01-03 14:58:20 -08:00
Daniel Plaisted
efdaa5f427 Escape semicolons when generating bundled versions 2018-12-31 17:13:06 -08:00
Daniel Plaisted
8d071f3d19
Merge pull request #230 from dsplaisted/additional-known-framework-info
Additional information about shared frameworks to bundled versions
2018-12-31 10:51:25 -08:00
Daniel Plaisted
9efaad971f Include runtime pack and other additional information for known frameworks 2018-12-30 00:14:44 -08:00
Livar Cunha
00aba8b3d0 Fixing FreeBSD build. 2018-12-28 15:16:07 -08:00
Livar
88a1a412d3
Merge pull request #227 from livarcocc/fix_pkg_installer
Fixes the layout of the dotnet-internal artifacts
2018-12-27 15:53:52 -08:00
Livar
ae5f9ac795
Merge pull request #225 from livarcocc/fix_tar_gz_generation
Adding a call to generate a targz for the combined Sdk + runtimes.
2018-12-27 15:46:52 -08:00
Livar Cunha
b46aa5d68e Fixes the layout of the dotnet-internal artifacts, which are used by the chained pkg, msi and -internal.zips/tarballs. We were flattenning all files in the folder. 2018-12-27 15:33:02 -08:00
Livar
0433e6b549
Addressing code review comment.
Fixing the set of files we put in the internal.tar.gz file.
2018-12-27 15:27:24 -08:00
Livar Cunha
5df3288c55 Adding a call to generate a targz for the combined Sdk + runtimes. We were missing that. 2018-12-27 15:01:45 -08:00
Livar Cunha
990a41eab1 Fixing the version branding for this repo back to preview. 2018-12-26 15:06:23 -08:00
Livar
f89ff73408 Fixing MSI generation. We were missing the Windows desktop version as a parameter to the bundle script. 2018-12-26 10:46:40 -08:00
Livar Cunha
3ce8eaefaa Merge branch 'master' into official_builds
* master:
  Adding a Wpf and Winforms templates registry key (#218)
  Update coresetup to preview-27218-01 (#216)
  Update WindowsDesktop Framework (#215)
  Update coresetup to preview-27217-02 (#214)
  Update coresetup to preview-27217-01
  Update coresetup to preview-27216-02 (#211)
  make GivenDotnetUsesDotnetTools test optional based on AspNetCore availability (#207)
  Update DependencyVersions.props
  Include the WindowsDesktop sharedframework in install 'Finish' page. (#208)
  Update readme; core-sdk:master (#209)
  Update WindowsDesktop
  Update toolset
  Update coresetup to preview-27214-02
  change debug to Debug to match managed part
  add entry for freebsd to badge processing
  update stage0 sdk to 3.0 preview
  Update coresetup to preview-27206-02 (#202)
  initial support for freebsd
2018-12-25 19:08:40 -08:00
Parallels
d3e2ea2488 Fixing debs generation. The issue was that we were losing the exec permission on the apphost in the sdk folder. This caused it to not be picked up by dh_shlibsdeps. This happened because the order of the apphost acquisition was changed to be after crossgen, where we change permissions of all files under the SDK folder to 644. The fix here was to make the apphost acquisition to happen after crossgen. 2018-12-25 11:52:51 -08:00
Livar Cunha
4556ac7915 Don't produce a sha file for cab files. We don't upload those. 2018-12-21 20:41:34 -08:00
Livar Cunha
23b7b332e6 Producing and publishing checksums. Also, publishing sdk assets ourselves, so that we can add metadata regarding where to push nupkgs. 2018-12-21 19:42:48 -08:00
Livar
92217daaa8 Removing strong name signing from our signing and fixing crossgen for arm. 2018-12-20 21:26:49 -08:00
Livar
b86ce49e8e Updating the YAML file to run ci and signing. 2018-12-20 15:25:20 -08:00
Livar Cunha
db5b588e45 Copy latest to blob when all legs succeed. 2018-12-20 13:21:18 -08:00
Livar
a7476cb30c
Merge pull request #153 from wfurt/freebsd
Unofficial support for freebsd
2018-12-11 11:06:45 -08:00
Daniel Plaisted
ee9799118e Remove commented out code 2018-12-06 18:22:29 -08:00
Daniel Plaisted
4980693ed6 Change release suffix to "arcade" 2018-12-06 14:07:36 -08:00
Daniel Plaisted
a84cda76e2 Create nupkg for VS insertion 2018-12-06 13:32:32 -08:00
Daniel Plaisted
f2481a29b3 Correctly generate internal and combined archives 2018-12-06 13:31:59 -08:00
Daniel Plaisted
5c56d2c273 Glob for .cab files to sign 2018-12-06 13:14:44 -08:00
Daniel Plaisted
583de7f027 Sign MSI and Bundle 2018-12-06 10:49:10 -08:00
Daniel Plaisted
f974e2bbac Merge upstream changes 2018-12-05 18:08:40 -08:00
Daniel Plaisted
60f6fe6496 Disable generating DEB packages
https://github.com/dotnet/core-sdk/issues/201
2018-12-05 18:02:18 -08:00
Daniel Plaisted
c6b78f4205 Use different dotnet and artifacts folders when running in docker (on Windows)
This means docker builds won't conflict with each other or with a non-docker build
2018-12-05 17:48:17 -08:00
Daniel Plaisted
2b9f55496d Remove dependency on target which doesn't exist 2018-12-05 14:02:31 -08:00
Daniel Plaisted
42c0ecb69a Hook up building installers to Pack target 2018-12-05 12:21:56 -08:00
Daniel Plaisted
406519bc8a Sign layout 2018-12-04 22:59:19 -08:00
Daniel Plaisted
6c8f08bbd9 Include AppHostTemplate 2018-12-03 18:58:43 -08:00
Daniel Plaisted
55841f78ea Crossgen layout 2018-12-03 18:15:31 -08:00
Daniel Plaisted
9c18e156fe Merge upstream changes 2018-12-03 18:10:32 -08:00
Daniel Plaisted
d4db5e64b5 Merge upstream changes 2018-11-29 17:27:58 -08:00
Daniel Plaisted
bde288e6d0 Don't include WindowsDesktop in ARM builds 2018-11-23 09:56:43 -08:00
Daniel Plaisted
d8b5dbb44b Apply code review feedback 2018-11-21 18:43:34 -08:00
Daniel Plaisted
23a826b544 Merge upstream changes 2018-11-21 15:53:12 -08:00
Daniel Plaisted
67c4e27948 Merge upstream changes 2018-11-20 18:45:43 -08:00
Daniel Plaisted
7b76c6dd89 Generate version file 2018-11-20 10:46:41 -08:00
Livar
25046ed471
Merge pull request #154 from dotnet/enable_win_arm
Enabling win-arm CI and builds.
2018-11-19 21:53:17 -08:00
Livar Cunha
6f3303f309 Enabling win-arm CI and builds. 2018-11-16 17:54:46 -08:00
User Toweinfu
36dfe5b5a9 initial support for freebsd 2018-11-16 17:51:51 -08:00
Livar Cunha
60aadab0a8 Stop downloading and add the lzma archive to the SDK output. 2018-11-16 17:02:14 -08:00
Daniel Plaisted
88fda677f3 Remove debugging code 2018-11-16 15:21:09 -08:00
Daniel Plaisted
f69d1f0fd3 Rename DesktopUI to WindowsDesktop 2018-11-16 15:20:52 -08:00
Daniel Plaisted
48c2d3ef4f Merge upstream changes 2018-11-16 13:56:21 -08:00
Daniel Plaisted
0bf42114de Include bundled tools in layout 2018-11-13 15:04:44 -08:00
Daniel Plaisted
b1b9dfda09 Include templates in layout 2018-11-12 15:23:44 -08:00
Daniel Plaisted
45c3817d65 Generate bundled versions 2018-11-12 11:52:19 -08:00
Daniel Plaisted
853a27da6f Add workaround for tar warning about "file changed as we read it" in Docker under Windows host 2018-11-08 08:10:33 -08:00
Daniel Plaisted
f4209b9de6 Don't try creating tar.gz archive on Windows 2018-11-07 18:17:30 -08:00
Daniel Plaisted
2bee59a9bc Create Mac PKG 2018-11-06 14:29:00 -08:00
Daniel Plaisted
8c9e6aea55 Move / rename PKG generation targets 2018-11-05 14:11:42 -08:00
Daniel Plaisted
24ccfbae1a Generate RPM Installer 2018-11-05 13:38:10 -08:00
Daniel Plaisted
d2528332b2 Move, merge, and rename RPM targets 2018-11-04 18:52:13 -08:00
Daniel Plaisted
143bee75ff Produce deb packages 2018-11-01 23:15:59 -07:00
Daniel Plaisted
8d026b422e Move and merge deb generation targets 2018-10-31 16:42:59 -07:00
Daniel Plaisted
1e32ccfb7e Generate Windows installers 2018-10-31 16:35:14 -07:00
Daniel Plaisted
6c0c9119fc Move and rename MSI installer targets 2018-10-31 12:43:19 -07:00
Daniel Plaisted
70dd736032 Create archives for core SDK layout 2018-10-29 13:31:03 -07:00
Daniel Plaisted
ce468ec79e Move layout folder 2018-10-29 12:26:31 -07:00
Daniel Plaisted
b155e4e8bf Multitarget core sdk tasks 2018-10-29 11:37:13 -07:00
Daniel Plaisted
ac23150af3 Include DesktopUI shared framework and toolset in redist layout 2018-10-24 16:05:02 -07:00
Daniel Plaisted
584ec3c3d6 Add more components to download / layout 2018-10-24 00:08:51 -07:00
Daniel Plaisted
1344cb26c2 Lay out components in publish directory 2018-10-23 23:15:58 -07:00
Daniel Plaisted
7ab1aa5a6c Set up infrastructure to download bundled components for layout 2018-10-23 18:16:45 -07:00
Daniel Plaisted
2e76a1e5fd Build Core SDK tasks to separate folder for consumption during main build 2018-10-22 20:04:13 -07:00
Daniel Plaisted
914f465b30 Get tests and skeleton build tasks building 2018-10-22 19:59:58 -07:00
Egor Chesakov
71f120f27d Enable CrossgenPublishDir for arm and arm64 in src/redist/redist.csproj 2018-10-13 10:10:12 -07:00
Livar
2c2238a572 Adding the winforms and wpf runtime to the SDK. For now, only for zips, as we don't have a msi yet to bundle up. 2018-08-13 17:04:48 -07:00
jbeisner
1537818815 The target: "PublishVersionFile" fails to fire as it is pinned to [line 30] AfterTargets="Publish" and [line 118] BeforeTargets="Publish" 2018-08-07 17:38:24 +00:00
Chris Rummel
5fab2468f5
Add dependency for restoring packages before trying to find Microsoft.NETCore.DotNetAppHost package.
This appears to be a difference between the 2.2.0-preview SDK currently
being used in core-sdk and the 2.1.401-preview SDK currently being used
in source-build.  In the 2.2.0 SDK, this target happens to run before
the resolved package list is used, but in the 2.1.401 it is not, so I
added the explicit dependency (doesn't affect anything in the 2.2.0 SDK).
2018-07-18 21:04:14 -05:00
jbeisner
d88a7ce337 The SDK-version directory under the SDK directory should match the advertised SDK version. 2018-07-17 16:40:52 +00:00
Daniel Plaisted
b3be19b820 Fix up runtimeconfig.json files for tools (dotnet, MSBuild, VSTest, etc) to target .NET Core 3.0 2018-07-09 13:46:04 -07:00
Parallels
4d9b015f8f Fixing a merge issue and crossgen issues. 2018-06-26 14:44:55 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
7bed83fc98 Disable crossgen for MSBuild inline-task refs 2018-05-21 15:29:37 -07:00
Livar
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
Tanner Gooding
f2f5c1b12b Merge remote-tracking branch 'dotnet/release/2.1.4xx' into merges/release/2.1.4xx-to-master 2018-05-07 10:55:14 -07:00
Livar Cunha
8c2160b6a0 Removing some patches for source build. 2018-05-02 11:59:01 -07:00
William Li
34060d3a23
pick up nuget loc (#9090) 2018-04-18 11:18:14 -07:00
Steve MacLean
8c937a0db0 [Arm64] Add crosscomponent crossgen (#9011) 2018-04-17 16:54:01 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Livar Cunha
b09b6bff26 Generating the conclusion.html files dynamically so that we don't need to set the version in them everytime our branding changes. 2018-04-04 20:57:45 -07:00
William Li
d3f69e2e01
Skip bundled dotnet tools (#8977) 2018-04-03 14:36:59 -07:00
William Li
e70f07178a
Apphost shim (#8893)
* Publish app host to folder under SDK

* Use carried apphost as shim

* Remove full framework launcher

* Fix test run command issue

* Use latest release/2.1 build

* Test with 32 bit env

* Add missing return

* Update to latest prodcon build

* Add xlfs
2018-04-02 12:37:25 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
John Beisner
a54f0ffb81
Enable 'arm' builds in the CLI (#8791)
* First draft enablement of Win-arm and Linux-arm builds for the CLI.

* Fixing a typo

* Disable tests for arm; enable badges and FinalizeBuild for arm.

* Remove the 'Win-arm' leg.

* Update the README

* Update the README [2]

* Update netci.groovy

* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
2018-03-14 19:04:25 -07:00
John Beisner
dbcd83075c
Creating and publishing 'symbols.nuget' to the blob feed. (#8712)
* Creating and publishing '*.symbols.nuget' to the blob feed.

* Reverting 'generatenupkg' methodology.

* Fixing formatting...

* Overwrite should = 'false'

* Second draft - Creating and publishing '*.symbols.nuget' to the blob feed.

* Fixing a VS auto-update.

* Removing the 'Microsoft.SymbolUploader.Build.Task' modifications; need to make a PR just for this.

* Change "sdk.*.Microsoft.DotNet.SDK.*.symbols.nupkg" to "runtime.*.Microsoft.DotNet.SDK.*.symbols.nupkg"; removing the 'DotNetRestore' on the Symbols.csproj

* Removing a 'todo' comment...

* Putting back the 'dotnet restore'

* Fixing a typo...

* Logical separation of the 'nupkg' from the 'symbols.nupkg' enumeration; fixed 'swr' pattern.

* Add "BLOBFEED_STORAGE_CONTAINER"
2018-03-13 08:19:15 -07:00
William Lee
08f050c012
bundled DotnetTool (#8606)
Extract packages to DotnetTools folder under sdk/{version}

Add new resolver to discover it

Add test to enforce package structure. It will fail when the structure
changed
2018-02-16 13:32:29 -08:00
Livar Cunha
e8f521cbef Stop re-targeting Roslyn to the CLI runtime. It will roll-forward to the CLI runtime (2.1.0) through minor version roll-forward if necessary. 2018-02-15 14:21:27 -08:00
Livar Cunha
7e32b9a593 Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx
* dotnet/release/2.1.2xx:
  Use satellites from roslyn package, not cli-deps-satellites
  Update to roslyn 2.7.0-beta3-62612-07 for 2.1.1xx

 Conflicts:
	build/DependencyVersions.props
	src/redist/redist.csproj
	src/tool_roslyn_satellites/tool_roslyn_satellites.csproj
2018-02-14 15:18:29 -08:00
Nick Guerrera
bc1fb44364 Use satellites from roslyn package, not cli-deps-satellites 2018-02-12 16:52:26 -08:00