Commit graph

14358 commits

Author SHA1 Message Date
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
dotnet-maestro[bot]
7a13384a0d
Update dependencies from https://github.com/dotnet/toolset build 20190926.5 (#4953)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.5

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19476.4 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-26 18:35:41 +00: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
5158bd0d7f
Fix errors in README.md merege 2019-09-24 13:03:32 -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
Nick Guerrera
9b60152978
Merge pull request #4857 from dotnet/darc-release/3.1.1xx-6b1fb78b-7c28-494d-8c13-7b8154f0306b
[release/3.1.1xx] Update dependencies from aspnet/AspNetCore
2019-09-24 10:18:26 -07:00
dotnet-maestro[bot]
8683689d7b Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.5
- dotnet-user-secrets - 3.1.0-preview1.19473.5
- dotnet-watch - 3.1.0-preview1.19473.5
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.5
- dotnet-dev-certs - 3.1.0-preview1.19473.5
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.5
2019-09-23 23:55:22 +00:00
dotnet-maestro[bot]
4ed5158c76 Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.3
- dotnet-user-secrets - 3.1.0-preview1.19473.3
- dotnet-watch - 3.1.0-preview1.19473.3
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.3
- dotnet-dev-certs - 3.1.0-preview1.19473.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.3
2019-09-23 20:55:24 +00:00
dotnet-maestro[bot]
48861bc8bd Update dependencies from https://github.com/aspnet/AspNetCore build 20190923.1
- dotnet-user-secrets - 3.1.0-preview1.19473.1
- dotnet-watch - 3.1.0-preview1.19473.1
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19473.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19473.1
- dotnet-dev-certs - 3.1.0-preview1.19473.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19473.1
2019-09-23 10:05:26 +00:00
dotnet-maestro[bot]
c16fbce6a8 Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.3
- dotnet-user-secrets - 3.1.0-preview1.19472.3
- dotnet-watch - 3.1.0-preview1.19472.3
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.3
- dotnet-dev-certs - 3.1.0-preview1.19472.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.3
2019-09-23 04:35:23 +00:00
dotnet-maestro[bot]
93fea43d47 Update dependencies from https://github.com/aspnet/AspNetCore build 20190922.1
- dotnet-user-secrets - 3.1.0-preview1.19472.1
- dotnet-watch - 3.1.0-preview1.19472.1
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19472.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19472.1
- dotnet-dev-certs - 3.1.0-preview1.19472.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19472.1
2019-09-23 01:15:23 +00:00
dotnet-maestro[bot]
39f74f36db Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.7
- dotnet-user-secrets - 3.1.0-preview1.19471.7
- dotnet-watch - 3.1.0-preview1.19471.7
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.7
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.7
- dotnet-dev-certs - 3.1.0-preview1.19471.7
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.7
2019-09-22 08:25:23 +00:00
dotnet-maestro[bot]
ac84ff0bdc Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.5
- dotnet-user-secrets - 3.1.0-preview1.19471.5
- dotnet-watch - 3.1.0-preview1.19471.5
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.5
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.5
- dotnet-dev-certs - 3.1.0-preview1.19471.5
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.5
2019-09-22 06:15:23 +00:00
dotnet-maestro[bot]
c1a7dd13aa Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.4
- dotnet-user-secrets - 3.1.0-preview1.19471.4
- dotnet-watch - 3.1.0-preview1.19471.4
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.4
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.4
- dotnet-dev-certs - 3.1.0-preview1.19471.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.4
2019-09-22 03:20:24 +00:00
dotnet-maestro[bot]
27da986c91 Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.3
- dotnet-user-secrets - 3.1.0-preview1.19471.3
- dotnet-watch - 3.1.0-preview1.19471.3
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.3
- dotnet-dev-certs - 3.1.0-preview1.19471.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.3
2019-09-22 00:40:23 +00:00
dotnet-maestro[bot]
1ecb4f37d9 Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.2
- dotnet-user-secrets - 3.1.0-preview1.19471.2
- dotnet-watch - 3.1.0-preview1.19471.2
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.2
- dotnet-dev-certs - 3.1.0-preview1.19471.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.2
2019-09-21 20:20:23 +00:00
dotnet-maestro[bot]
8974206ca7 Update dependencies from https://github.com/aspnet/AspNetCore build 20190921.1
- dotnet-user-secrets - 3.1.0-preview1.19471.1
- dotnet-watch - 3.1.0-preview1.19471.1
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19471.1
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19471.1
- dotnet-dev-certs - 3.1.0-preview1.19471.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19471.1
2019-09-21 11:30:24 +00:00
dotnet-maestro[bot]
7b3d6dd8bf Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.14
- dotnet-user-secrets - 3.1.0-preview1.19470.14
- dotnet-watch - 3.1.0-preview1.19470.14
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.14
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.14
- dotnet-dev-certs - 3.1.0-preview1.19470.14
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.14
2019-09-21 01:00:26 +00:00
dotnet-maestro[bot]
abd1e70d5f
Update dependencies from https://github.com/dotnet/core-setup build 20190920.9 (#4915)
- Microsoft.NETCore.App - 3.1.0-preview1.19470.9
- NETStandard.Library.Ref - 2.1.0-preview1.19470.9
- Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.9
2019-09-21 00:10:44 +00: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]
0411300794 Update dependencies from https://github.com/aspnet/AspNetCore build 20190920.3
- dotnet-user-secrets - 3.1.0-preview1.19470.3
- dotnet-watch - 3.1.0-preview1.19470.3
- Microsoft.AspNetCore.App.Ref - 3.1.0-preview1.19470.3
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0-preview1.19470.3
- dotnet-dev-certs - 3.1.0-preview1.19470.3
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.0-preview1.19470.3
2019-09-20 16:21:34 -07:00
dotnet-maestro[bot]
ba461bc51b
Update dependencies from https://github.com/dotnet/core-setup build 20190920.5 (#4911)
- Microsoft.NETCore.App - 3.1.0-preview1.19470.5
- NETStandard.Library.Ref - 2.1.0-preview1.19470.5
- Microsoft.WindowsDesktop.App - 3.1.0-preview1.19470.5
2019-09-20 21:55:44 +00:00
Livar
04339c3a26
Merge pull request #4891 from dotnet/darc-release/3.0.1xx-ed8e3d43-5799-47c6-a7d9-5239ca959073
[release/3.0.1xx] Update dependencies from dotnet/toolset
2019-09-18 01:06:45 -07:00
dotnet-maestro[bot]
974858568a Update dependencies from https://github.com/dotnet/toolset build 20190918.3
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19468.3
2019-09-18 08:05:22 +00:00
Matt Mitchell
1f6f745127
Fix core-setup nuget feed (#4890) 2019-09-18 01:01:51 -07:00
Livar
0356629415
Merge pull request #4888 from dotnet/darc-release/3.0.1xx-e28a33cc-c2ed-46fb-a0d0-b5c5cdf2569a
[release/3.0.1xx] Update dependencies from dotnet/toolset
2019-09-18 00:23:28 -07:00
dotnet-maestro[bot]
3e3ba458e9 Update dependencies from https://github.com/dotnet/toolset build 20190918.2
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19468.2

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.7 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-18 07:22:47 +00: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
dotnet-maestro[bot]
ebe9fb2b57
Update dependencies from https://github.com/dotnet/toolset build 20190917.9 (#4882)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.9

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.4 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-18 03:41:26 +00:00
dotnet-maestro[bot]
d323b63a30
Update dependencies from https://github.com/dotnet/core-setup build 20190917.7 (#4883)
- Microsoft.NETCore.App - 3.1.0-preview1.19467.7
- NETStandard.Library.Ref - 2.1.0-preview1.19467.7
- Microsoft.WindowsDesktop.App - 3.1.0-preview1.19467.7
2019-09-18 03:30:44 +00:00
dotnet-maestro[bot]
956e75fb5a
Update dependencies from https://github.com/dotnet/toolset build 20190917.8 (#4881)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.8

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-18 02:45:24 +00:00
Livar
82f30a92ef
Merge pull request #4880 from dotnet/darc-release/3.0.1xx-b6398eca-0a8c-4640-9981-196560efe978
[release/3.0.1xx] Update dependencies from dotnet/toolset
2019-09-17 18:12:01 -07:00
dotnet-maestro[bot]
6099514615 Update dependencies from https://github.com/dotnet/toolset build 20190917.7
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.7
2019-09-18 00:40:22 +00:00
dotnet-maestro[bot]
81c33ddf1d
Update dependencies from https://github.com/dotnet/toolset build 20190917.6 (#4878)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19467.6

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc2.19467.1 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-18 00:00:50 +00:00
Matt Mitchell
88e6663236
Turn off stable builds (#4874) 2019-09-17 13:58:14 -07:00
Matt Mitchell
8dbe4ac1bc
Remove generate graph files (#4867)
Takes too long and output isn't quite as useful as it once was (BARViz does most of the work)
2019-09-16 15:39:36 -07:00
dotnet-maestro[bot]
bb005e3ca8
Update dependencies from https://github.com/dotnet/toolset build 20190916.4 (#4866)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19466.4
2019-09-16 22:10:49 +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
02df19ceac
Remove unneeded package sources (#4853)
* Remove unneeded package sources
Remove many packages sources that are no longer needed.
We think this may be increasing restore time and thus parallel builds of test projects are timing out while accessing the feeds.
2019-09-15 22:25:54 -07:00
Matt Mitchell
d71c243ebf Empty commit to update commit height 2019-09-15 19:49:11 -07:00
Matt Mitchell
2834b77278
Stabilize package versions (#4833) 2019-09-15 17:41:50 -07:00
dotnet-maestro[bot]
06dd6a37ff Update dependencies from https://github.com/dotnet/toolset build 20190915.6 (#4852)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19465.6

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19465.3 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-15 17:41:40 -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]
969693d5f7
Update dependencies from https://github.com/dotnet/toolset build 20190914.12 (#4840)
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19464.12

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc2.19464.6 (parent: Microsoft.Dotnet.Toolset.Internal)
2019-09-15 05:46:02 +00:00