mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
16824 commits 41 branches 190 tags 95 MiB
Commit graph

3626 commits

Author SHA1 Message Date
Nick Guerrera
8939b79a71 Add support for netcoreapp3.1, fix netcoreapp3.0, and fix tests 2019-10-18 14:48:44 -07:00
Nick Guerrera
4ea1958851 Merge branch 'master' into merges/release/3.1.1xx-to-master 2019-10-17 15:43:59 -07:00
Daniel Plaisted
c143f5e9b3 Update branding to 3.1.100-preview2 2019-10-14 11:42:24 -07:00
dotnet-maestro[bot]
dab2f0c140
[master] Update dependencies from dotnet/windowsdesktop (#5171) 
* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.4

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.4

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20191008.5

- Microsoft.WindowsDesktop.App - 5.0.0-alpha1.19508.5

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.19462.11 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha1.19462.16 (parent: Microsoft.WindowsDesktop.App)

* Use dotnet/windowsdesktop outputs
 2019-10-08 17:50:59 +00:00
Nick Guerrera
0f52aed34c Prepare for 3.0.1xx servicing 
We were bumping targeting pack, framework-dependent default
runtime version, and self-contained default (latest) runtime
version in unison. This only works for previews where these
versions are all the same always. Now that we're servicing 3.0,
we:

1. Pin targeting packs to 3.0.0
2. Fix default framework-dependent runtime version at 3.0.0

This change also:

* Removes dependencies on legacy/internal netcoreapp packages. We
  now use Microsoft.NETCore.App.Internal version exclusively to
  calculate the blob storage path for core-setup.

* Uses PackageDownload for all templates, including
  latest. PackageReference had been used for latest only because
  it hid another bug with the netcoreapp reference of
  redist.csproj that is fixed here. That reference is now a
  FrameworkReference as it should be.

* Removes a bunch of shenanigans from
  GenerateBundledVersions.props that were causing issues with
  above. One casualty of that is that we hard code the RID lists
  for runtime pack, which I don't think is too bad, and actually
  will make it easier to merge in source build patches.

* Cleans up how runtime and targeting pack versions are
  referenced throughout, removing incorrect assumptions about
  them being the same.

* Incorporates a prior closed PR to use suffixed version for blob
  storage, even when assets coming from blob storage are
  stabilized. It needed changes to merge with this.

Note:

* A similar theoretical servicing issue exists for the versions
  of apphost, hostfxr, shared host, which are still assumed to be
  the same as the runtime version in several places. If we choose
  to service those independently, more work is required.

* There will be a 3.0.1 ASP.NET targeting pack, and so we will
  have to unpin that once it is ready. This change establishes
  the baseline of all targeting packs being pinnned, and they can
  be unpinned in the (hopefully rare) cases where they need to be
  serviced.
 2019-10-03 22:57:58 -07:00
John Beisner
1a7f735b3e
Enabling ASP.NET targeting pack and shared framework in RPM/DEB native installers. (#5090) 2019-10-03 14:37:59 -07:00
Nick Guerrera
7c72c6cb8d Fix typo causing 3.1 ASP.NET runtime pack to not be found 2019-10-02 12:42:28 -07:00
John Beisner
3623a38fb0
Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-10-02 09:49:29 -07:00
Divino César
57c03e2caf Download blobs from MSRC storage & Add CredProvider to Dockerfiles (#4753) 
* Download core-setup files from MSRC storage

Add support for downloading core-setup files from an authenticated endpoint

* Update GenerateLayout.targets

* Adding changes to pass SAS token around

* Add credential provider to Dockerfile's

* Update after PR feedback

* Add comments about approach

* Copy NuGet config variables
 2019-10-01 13:22:33 -07:00
Nick Guerrera
0ef7c20be6 Fix missing download for Microsoft.DotNet.Web.ItemTemplates 3.0 2019-09-30 13:11:18 -07:00
Nick Guerrera
b06c620cf2 Fix merge errors 2019-09-30 12:34:02 -07:00
Nick Guerrera
9154996a8b Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-30 11:38:51 -07:00
William Li
4c79da6f03
Remove opensuse (#4955) 2019-09-29 20:58:16 -07:00
Nick Guerrera
a4b4a7c9c5 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-26 15:33:25 -07:00
John Beisner
6d6273bc94
Sign the 3.1 Templates MSI (#4956) 2019-09-26 15:30:56 -07:00
Nick Guerrera
1ad1be909a Merge branch 'release/3.0.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-26 15:12:34 -07:00
dotnet-maestro[bot]
61327a9bcb
[release/3.0.1xx] Update dependencies from dotnet/arcade (#4933) 
* Update dependencies from https://github.com/dotnet/arcade build 20190924.3

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

* Update NuGet.config

* React to NuGet design change for PackageDownload with multiple versions

A single item must be used with semicolon-delimited versions.
 2019-09-26 21:15:58 +00:00
William Li
59212cdc43
Remove opensuse (#4960) 2019-09-26 14:15:25 -07:00
John Beisner
156f17d882
Add 3.1 Templates MSIs (#4931) 
* Adding 3.1 Templates MSI
 2019-09-25 11:28:12 -07:00
Livar
ca0986c0ff
Updating branding to 3.0.1-servicing (#4924) 
* Updating branding to 3.0.1-servicing

Also removed the DropSuffix so that we stop producing final branded builds for now.

* Address code review comments

Set DropSuffix to false instead of removing it.
 2019-09-24 16:09:49 -07:00
Nick Guerrera
2ca44ceace Use stable 3.0.0/2.1.0 versions where appropriate 2019-09-24 12:48:28 -07:00
Nick Guerrera
ee070dc387 Fix typos in merge conflict resolution 2019-09-24 12:35:59 -07:00
Nick Guerrera
ceaa1c3a24 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-09-24 12:25:06 -07:00
John Beisner
76a361bbf8 Add CrossPlatform AppHost Packs; release/3.1.1xx (#4916) 
* Add CrossPlatform AppHost Packs for arm & arm64.
 2019-09-24 10:36:04 -07:00
Nick Guerrera
5c361b66bb Fix 3.1 tests 2019-09-20 16:21:57 -07:00
Nick Guerrera
a3bb220185 Add 3.1 templates 2019-09-20 16:21:57 -07:00
Nick Guerrera
0386ae221d React to msi rename 2019-09-20 16:21:57 -07:00
dotnet-maestro[bot]
5f6a012764 [release/3.0.1xx] Update dependencies from dotnet/toolset (#4886) 
* Update dependencies from https://github.com/dotnet/toolset build 20190917.12

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.12

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal)

* Set to stable build
 2019-09-18 00:20:16 -07:00
Matt Mitchell
88e6663236
Turn off stable builds (#4874) 2019-09-17 13:58:14 -07:00
dotnet-maestro[bot]
61dd7339c7
[master] Update dependencies from aspnet/AspNetCore (#4391) 
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190828.12

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19428.12
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19428.12
- dotnet-watch - 5.0.0-alpha1.19428.12
- dotnet-user-secrets - 5.0.0-alpha1.19428.12
- dotnet-dev-certs - 5.0.0-alpha1.19428.12

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190830.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19430.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19430.9
- dotnet-watch - 5.0.0-alpha1.19430.9
- dotnet-user-secrets - 5.0.0-alpha1.19430.9
- dotnet-dev-certs - 5.0.0-alpha1.19430.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.5
- dotnet-watch - 5.0.0-alpha1.19453.5
- dotnet-user-secrets - 5.0.0-alpha1.19453.5
- dotnet-dev-certs - 5.0.0-alpha1.19453.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190903.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19453.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19453.8
- dotnet-watch - 5.0.0-alpha1.19453.8
- dotnet-user-secrets - 5.0.0-alpha1.19453.8
- dotnet-dev-certs - 5.0.0-alpha1.19453.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.6

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.6
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.6
- dotnet-watch - 5.0.0-alpha1.19454.6
- dotnet-user-secrets - 5.0.0-alpha1.19454.6
- dotnet-dev-certs - 5.0.0-alpha1.19454.6

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190904.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19454.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19454.9
- dotnet-watch - 5.0.0-alpha1.19454.9
- dotnet-user-secrets - 5.0.0-alpha1.19454.9
- dotnet-dev-certs - 5.0.0-alpha1.19454.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190906.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19456.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19456.3
- dotnet-watch - 5.0.0-alpha1.19456.3
- dotnet-user-secrets - 5.0.0-alpha1.19456.3
- dotnet-dev-certs - 5.0.0-alpha1.19456.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.1
- dotnet-watch - 5.0.0-alpha1.19459.1
- dotnet-user-secrets - 5.0.0-alpha1.19459.1
- dotnet-dev-certs - 5.0.0-alpha1.19459.1

* Update 3.0 versions to rc1, update TargetFramework for ASP.NET framework reference

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190909.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19459.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19459.4
- dotnet-watch - 5.0.0-alpha1.19459.4
- dotnet-user-secrets - 5.0.0-alpha1.19459.4
- dotnet-dev-certs - 5.0.0-alpha1.19459.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.3

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.3
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.3
- dotnet-watch - 5.0.0-alpha1.19461.3
- dotnet-user-secrets - 5.0.0-alpha1.19461.3
- dotnet-dev-certs - 5.0.0-alpha1.19461.3

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.5
- dotnet-watch - 5.0.0-alpha1.19461.5
- dotnet-user-secrets - 5.0.0-alpha1.19461.5
- dotnet-dev-certs - 5.0.0-alpha1.19461.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.8

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.8
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.8
- dotnet-watch - 5.0.0-alpha1.19461.8
- dotnet-user-secrets - 5.0.0-alpha1.19461.8
- dotnet-dev-certs - 5.0.0-alpha1.19461.8

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.11

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.11
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.11
- dotnet-watch - 5.0.0-alpha1.19461.11
- dotnet-user-secrets - 5.0.0-alpha1.19461.11
- dotnet-dev-certs - 5.0.0-alpha1.19461.11

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.13

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19461.13
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19461.13
- dotnet-watch - 5.0.0-alpha1.19461.13
- dotnet-user-secrets - 5.0.0-alpha1.19461.13
- dotnet-dev-certs - 5.0.0-alpha1.19461.13

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.1
- dotnet-watch - 5.0.0-alpha1.19462.1
- dotnet-user-secrets - 5.0.0-alpha1.19462.1
- dotnet-dev-certs - 5.0.0-alpha1.19462.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.5
- dotnet-watch - 5.0.0-alpha1.19462.5
- dotnet-user-secrets - 5.0.0-alpha1.19462.5
- dotnet-dev-certs - 5.0.0-alpha1.19462.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190912.9

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19462.9
- dotnet-watch - 5.0.0-alpha1.19462.9
- dotnet-user-secrets - 5.0.0-alpha1.19462.9
- dotnet-dev-certs - 5.0.0-alpha1.19462.9

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.1

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.1
- dotnet-watch - 5.0.0-alpha1.19466.1
- dotnet-user-secrets - 5.0.0-alpha1.19466.1
- dotnet-dev-certs - 5.0.0-alpha1.19466.1

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.2

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.2
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.2
- dotnet-watch - 5.0.0-alpha1.19466.2
- dotnet-user-secrets - 5.0.0-alpha1.19466.2
- dotnet-dev-certs - 5.0.0-alpha1.19466.2

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.4

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.4
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.4
- dotnet-watch - 5.0.0-alpha1.19466.4
- dotnet-user-secrets - 5.0.0-alpha1.19466.4
- dotnet-dev-certs - 5.0.0-alpha1.19466.4

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.5

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.5
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.5
- dotnet-watch - 5.0.0-alpha1.19466.5
- dotnet-user-secrets - 5.0.0-alpha1.19466.5
- dotnet-dev-certs - 5.0.0-alpha1.19466.5

* Update dependencies from https://github.com/aspnet/AspNetCore build 20190916.7

- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha1.19466.7
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha1.19466.7
- dotnet-watch - 5.0.0-alpha1.19466.7
- dotnet-user-secrets - 5.0.0-alpha1.19466.7
- dotnet-dev-certs - 5.0.0-alpha1.19466.7

* Support targeting ASP.NET Core 5.0
 2019-09-17 20:09:37 +00:00
Matt Mitchell
63f7b6f811
[release/3.0.1xx] Fix resource branding (#4859) 
* Fix resource branding
The resource branding for MicrosoftNETCoreApp and the Windows desktop runtime does not come from the same properties any longer.  Use appropriate properties instead.

* Fix Linux native installer branding
 2019-09-16 10:49:46 -07:00
Matt Mitchell
88949b55f5
Fix "you are using a preview version" message (#4860) 
The property in the bundled version props file installed with the SDK is _NETCoreSdkIsPreview. We use the same property name to define this value when creating the props file. We build with a preview version of the SDK. Because this is set by the preview SDK, and already has a value, we will not reset it when DropSuffix=true. It will simply remain 'true'. Thus we will simply propagate that existing value into the new props file.  To fix, change the property name.
 2019-09-16 10:47:04 -07:00
Matt Mitchell
2834b77278
Stabilize package versions (#4833) 2019-09-15 17:41:50 -07:00
dotnet-maestro[bot]
b6037e6820 [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#4851) 
* Update dependencies from https://github.com/aspnet/AspNetCore build 20190915.2

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

* Correctly identify aspnetcore blob subdir
 2019-09-15 17:27:29 -07:00
dotnet-maestro[bot]
5c5cd9667f [release/3.0.1xx] Update dependencies from dotnet/core-setup (#4815) 
* Update dependencies from https://github.com/dotnet/core-setup build 20190913.05

- Microsoft.NETCore.App - 3.0.0-rc2-19463-05
- NETStandard.Library.Ref - 2.1.0
- Microsoft.WindowsDesktop.App - 3.0.0-rc2-19463-05

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc2.19462.10 (parent: Microsoft.WindowsDesktop.App)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0 (parent: Microsoft.WindowsDesktop.App)

* Add a dependency on Microsoft.NETCore.Platforms
This is not directly depended upon, but causes Maestro to flow stable feed locations.

* Use runtime package version

* Fix installer download locations

* Update windows desktop installer location

* Explicit reference the host model

* Make ref package version explicit

* Update property used to identify host version

* Update apphost versions

* Updated property versions to be used for branding, crossgen and bundled versions generation.
 2019-09-13 18:36:11 -07:00
jbeisner
0e0ab3e6f3 Add an icon to the SDKPlaceHolder MSI 2019-09-11 17:14:57 -07:00
Chris Rummel
db6496271c Don't overwrite AspNetCoreSharedFxInstallerRid if it's already set. (#4734) 2019-09-11 15:45:08 -07:00
Livar
0714086bdf
Fixing the channel for the master branch. 2019-09-11 14:48:13 -07:00
John Beisner
9d2ba908f0
Merge pull request #4638 from imba-tjd/patch-1 
LOC update for zh-cn and zh-tw
 2019-09-11 12:49:51 -07:00
Livar Cunha
0fa63a5fef Re-doing the merge of GenerateBundledVersion.targets. 2019-09-11 10:33:24 -07:00
Livar Cunha
5421af4ad6 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merges/release/3.1.1xx-to-master 
* upstream/release/3.1.1xx: (422 commits)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.12 (#4733)
  Update dependencies from https://github.com/dotnet/toolset build 20190911.11 (#4731)
  Update dependencies from https://github.com/aspnet/AspNetCore build 20190911.1 (#4729)
  [release/3.1.1xx] Update dependencies from dotnet/toolset (#4211)
  Update dependencies from https://github.com/dotnet/arcade build 20190910.3 (#4728)
  Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions
  Add support for targeting .NET Core 3.1
  Update latest patch versions
  Update dependencies from https://github.com/dotnet/arcade build 20190909.10 (#4716)
  Do not download for 'arm*'
  Formatting...
  Download the ASP.NET SharedFramework MSI and the Module V2 MSI
  Update dependencies from https://github.com/dotnet/arcade build 20190908.2 (#4695)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.7
  Add release/3.1.xx download to readme (#4618)
  Update dependencies from https://github.com/dotnet/core-setup build 20190908.3
  Update dependencies from https://github.com/dotnet/arcade build 20190907.1 (#4667)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.10
  Update dependencies from https://github.com/dotnet/arcade build 20190906.10 (#4643)
  Update dependencies from https://github.com/dotnet/core-setup build 20190907.3
  ...

Conflicts:
README.md
eng/Version.Details.xml
eng/Versions.props
eng/common/native/install-cmake-test.sh
global.json
src/redist/targets/GenerateBundledVersions.targets
src/redist/targets/Versions.targets
 2019-09-11 10:09:32 -07:00
Daniel Plaisted
82c5e8502c
Merge pull request #4600 from dotnet/merges/release/3.0.100-preview9-to-release/3.0.1xx 
Merge release/3.0.100-preview9 to release/3.0.1xx
 2019-09-10 17:13:37 -07:00
Daniel Plaisted
ce3db2423f
Merge pull request #4721 from dsplaisted/support-3.1 
Support targeting .NET Core 3.1
 2019-09-10 16:04:06 -07:00
Daniel Plaisted
61d7005440 Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions 2019-09-10 15:03:12 -07:00
Daniel Plaisted
9931222c67 Update latest patch versions 2019-09-10 14:06:57 -07:00
Daniel Plaisted
827464d908 Add support for targeting .NET Core 3.1 2019-09-10 13:58:14 -07:00
Daniel Plaisted
724015cc60 Update latest patch versions 2019-09-10 13:53:43 -07:00
Livar
527312b4af
Fixing channel 2019-09-10 13:37:30 -07:00
jbeisner
b9ade4c05c Do not download for 'arm*' 2019-09-09 12:51:24 -07:00
jbeisner
cbafd9b1f4 Formatting... 2019-09-09 12:43:04 -07:00
jbeisner
01566ce154 Download the ASP.NET SharedFramework MSI and the Module V2 MSI 2019-09-09 12:38:32 -07:00
谭九鼎
5358c34cb7
Revert "Runtime" translation 2019-09-07 18:16:44 +08:00
谭九鼎
df3e5a9908
Update statement, add spaces, fix typo 2019-09-07 18:14:38 +08:00
Livar
8eedfce749
Updating branding to rc2 2019-09-05 12:41:56 -07:00
Livar Cunha
f0d988effa Fix the branch info information to use release/3.0.100-preview9. 2019-09-05 12:35:44 -07:00
Daniel Ye
8947097610 Localization update for PTB term changes. 2019-09-04 14:15:56 -07:00
jbeisner
0c67172baf Updates for 3.1.1xx 2019-09-03 14:33:11 -07:00
Matt Mitchell
6ef4a17f0e
Fix branch info in release/3.0.1xx branch 
Channel was changed incorrectly in https://github.com/dotnet/core-sdk/pull/4182/files
 2019-08-27 13:06:39 -07:00
Livar
2243a75129
Merge branch 'release/3.0.1xx' into merges/release/3.0.100-preview9-to-release/3.0.1xx 2019-08-27 10:43:09 -07:00
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
Matt Mitchell
7532bd3f62
Fix p9 branch channel. (#4179) 2019-08-22 15:58:51 -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
Livar Cunha
a138255f58 Keep the latest channel as release/3.0.1xx. 2019-07-28 12:04:40 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -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
Dan Seefeldt
453414fc75 Consolidate MSBuild* versions for source-build (#2554) 2019-06-20 15:24:02 -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
202d9f2daa
Merge pull request #2279 from dsplaisted/add-ui-knownframeworks 
Add KnownFrameworkReference items for WPF and WindowsForms profiles
 2019-06-05 11:40:21 -07:00
Nick Guerrera
92d69e6885
Exclude sdk resolver layout from source build (#2232) 2019-06-04 13:05:25 -07:00
Daniel Plaisted
e5275d990f Add KnownFrameworkReference items for WPF and WindowsForms profiles 2019-06-03 19:01:54 -07:00
William Li
7cbec05bd5 correct branch info on master (#2253) 2019-06-03 17:30:28 -07:00
William Li
b47d352a48 Update branding to preview 7 2019-06-02 19:35:45 -07:00
William Li
f4215da1b7 Merge remote-tracking branch 'origin/release/3.0.1xx' into merges/release/3.0.1xx-to-master 2019-06-02 10:52:22 -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
Daniel Plaisted
75702b2d6e
Merge pull request #1839 from dagood/fix-core-setup-download 
Fix core-setup update: download consolidated dotnet-runtime-deps Deb pkg
 2019-05-03 16:03:57 -07:00
Davis Goodin
3985d797c8 Download consolidated dotnet-runtime-deps Deb pkg 2019-05-03 17:18:14 -05:00
Ricardo Arenas
1c52fe86a7 make publish of internal asset conditional (#1832) 2019-05-02 10:50:02 -07: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