Commit graph

771 commits

Author SHA1 Message Date
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
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
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
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
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