From 074948e937020f12e5e4040a09a7ae1d1b1dfa1b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Jul 2020 23:00:59 +0000 Subject: [PATCH 001/214] Merged PR 9150: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:1c74a4cf-f8fa-4208-c6c0-08d828f853f1) ## From https://github.com/dotnet/runtime - **Subscription**: 1c74a4cf-f8fa-4208-c6c0-08d828f853f1 - **Build**: 20200717.18 - **Date Produced**: 7/18/2020 12:58 AM - **Commit**: 095788708c9e8764e0fb5b47d57fd6ec8efee91c - **Branch**: refs/heads/internal/release/5.0-preview8 - **Updates**: - **System.CodeDom**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **Microsoft.NET.HostModel**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **Microsoft.Extensions.DependencyModel**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **Microsoft.NETCore.App.Ref**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **System.Resources.Extensions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **System.Security.Cryptography.ProtectedData**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 - **System.Text.Encoding.CodePages**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20367.18 [marker]: <> (End:1c74a4cf-f8fa-4208-c6c0-08d828f853f1) --- .vsts-ci.yml | 49 +++++++++++++++++++++++++++++------------ eng/Version.Details.xml | 36 +++++++++++++++--------------- eng/Versions.props | 18 +++++++-------- eng/build.yml | 21 +++++++++++++++++- 4 files changed, 82 insertions(+), 42 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3b8c5d88ab1d..346fd082fcfb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -43,11 +43,11 @@ stages: queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2017 + queue: BuildPool.Windows.10.Amd64.VS2019.Pre helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open strategy: matrix: - ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: Build_Debug: _BuildConfig: Debug _PublishType: none @@ -55,22 +55,29 @@ stages: _Test: -test Build_Release: _BuildConfig: Release - ${{ if eq(variables['System.TeamProject'], 'public') }}: + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: _PublishType: none _SignType: test _Test: -test - ${{ if ne(variables['System.TeamProject'], 'public') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: _PublishType: blob _SignType: real _Test: '' - - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/build.yml parameters: agentOs: Windows_NT_FullFramework pool: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open - helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre + ${{ if eq(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: Windows.10.Amd64.ClientRS5.VS2019.BT strategy: matrix: Build_Debug: @@ -88,8 +95,12 @@ stages: parameters: agentOs: Windows_NT_TestAsTools pool: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre strategy: matrix: Build_Debug: @@ -101,9 +112,16 @@ stages: parameters: agentOs: Ubuntu_16_04 pool: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open - helixTargetQueue: Ubuntu.1604.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: BuildPool.Ubuntu.1604.Amd64.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + name: NetCoreInternal-Pool + queue: BuildPool.Ubuntu.1604.Amd64 + ${{ if eq(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: Ubuntu.1604.Amd64.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: Ubuntu.1604.Amd64 strategy: matrix: Build_Debug: @@ -120,7 +138,10 @@ stages: agentOs: Darwin pool: name: Hosted macOS - helixTargetQueue: OSX.1014.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: OSX.1014.Amd64.Open + ${{ if ne(variables['System.TeamProject'], 'public') }}: + helixTargetQueue: OSX.1014.Amd64 strategy: matrix: Build_Debug: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8480901aff83..31178157d262 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 6bb0326ac089950ead3b19fc83e34444c084e8f5 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 095788708c9e8764e0fb5b47d57fd6ec8efee91c https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 067808b7fa27..a2409803c441 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20367.18 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20367.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20367.18 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20367.18 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20367.18 diff --git a/eng/build.yml b/eng/build.yml index 4d8274a3c1c1..545d16f4d243 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -36,7 +36,8 @@ jobs: - _OfficialBuildIdArgs: '' - _PublishArgs: '' - _SignArgs: '' - - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - _InternalRuntimeDownloadArgs: '' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs - group: DotNet-HelixApi-Access - group: dotnet-benchview @@ -52,7 +53,21 @@ jobs: /p:PublishToAzure=$(_PublishToAzure) - _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName) - _PerfIterations: 25 + + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - group: DotNet-MSRC-Storage + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - script: eng\CIBuild.cmd -configuration $(_BuildConfig) @@ -60,6 +75,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -88,6 +104,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) @@ -118,6 +135,7 @@ jobs: $(_SignArgs) $(_OfficialBuildIdArgs) $(_Test) + $(_InternalRuntimeDownloadArgs) /p:RunTestsAsTool=true displayName: Build env: @@ -131,6 +149,7 @@ jobs: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build env: BuildConfig: $(_BuildConfig) From caa1a2c7ea962ae942e6ced2fc2fa3fefbd15099 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jul 2020 01:16:28 +0000 Subject: [PATCH 002/214] Merge pull request 9218 from darc-internal/release/5.0.1xx-preview8-c808651c-849a-4b83-8e59-39de2552f11f into internal/release/5.0.1xx-preview8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31178157d262..821d6cb84110 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 6bb0326ac089950ead3b19fc83e34444c084e8f5 + 096be35db97669a59b298168b2be30f9b43eab8a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a2409803c441..ed797be900ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,7 +98,7 @@ - 5.0.0-preview.8.20322.2 + 5.0.0-preview.8.20371.3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 35747953cde82efed927955dae395ef83a34cdc4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jul 2020 01:39:27 +0000 Subject: [PATCH 003/214] Merge pull request 9210 from darc-internal/release/5.0.1xx-preview8-a9ca0cad-fe11-40e1-9fe8-040cec6d2bd5 into internal/release/5.0.1xx-preview8 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 821d6cb84110..641c0c9bf005 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 095788708c9e8764e0fb5b47d57fd6ec8efee91c - - https://github.com/dotnet/windowsdesktop - 0f0a20ef103bd864b48bbb44ea55bccbecc450c7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + 1f586b2c468475cbe2e6288ad45c79b7fd85ae28 - - https://github.com/dotnet/wpf - abb96f98a8f4f94a08744404ce3a2cf0c784ed6d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 9ed15f029633274101037fb9327d2bbd7f556caa https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ed797be900ef..12c57f867199 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20366.12 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20370.5 From cb42935285d893f5c9bb66c5ab46cd9b0cf93d58 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Jul 2020 18:07:59 +0000 Subject: [PATCH 004/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 641c0c9bf005..8a22ba20584b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1f586b2c468475cbe2e6288ad45c79b7fd85ae28 + c2af5558fd0f5e0654449b82311e78fc10e1cdd7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9ed15f029633274101037fb9327d2bbd7f556caa + 63385cc18cdc8e28d5a1e1b6c7ab1c4a2ccdacd5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 12c57f867199..2d67c3c3f3cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20366.12 + 5.0.0-preview.8.20371.3 - 5.0.0-preview.8.20370.5 + 5.0.0-preview.8.20371.2 From 9863975edfdf9095289626b37cc9ee97376d5579 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jul 2020 05:16:19 +0000 Subject: [PATCH 005/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20371.3 to 5.0.0-preview.8.20372.8 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20371.2 to 5.0.0-preview.8.20372.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20371.3 to 5.0.0-preview.8.20372.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8036e2ee316c..403d8e8778e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 095788708c9e8764e0fb5b47d57fd6ec8efee91c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2af5558fd0f5e0654449b82311e78fc10e1cdd7 + 8f6af76585edb55ce605ed6e747fdd7e8f98df78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 63385cc18cdc8e28d5a1e1b6c7ab1c4a2ccdacd5 + 77f4073a77883aeae77c732017ec3e1b85ec06c4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 78a665b543b0..c0d50480739c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20371.3 + 5.0.0-preview.8.20372.8 - 5.0.0-preview.8.20371.2 + 5.0.0-preview.8.20372.5 From a4f1c9aea6ed4b569e340f8465061eee36af1097 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jul 2020 17:29:42 +0000 Subject: [PATCH 006/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime - Updates: - System.CodeDom: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - Microsoft.NET.HostModel: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - Microsoft.Extensions.DependencyModel: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - Microsoft.NETCore.App.Ref: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - System.Resources.Extensions: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - System.Security.Cryptography.ProtectedData: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 - System.Text.Encoding.CodePages: from 5.0.0-preview.8.20367.18 to 5.0.0-preview.8.20372.7 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4329f119a74..81b62492eed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 096be35db97669a59b298168b2be30f9b43eab8a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - 095788708c9e8764e0fb5b47d57fd6ec8efee91c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index ed4f94cff7a1..e465c2629d08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20372.7 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20367.18 - 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20367.18 - 5.0.0-preview.8.20367.18 - 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20367.18 - 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20367.18 + 5.0.0-preview.8.20372.7 From 3a4dc2a7471a512606e163f5e73b308985335ea0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jul 2020 20:54:02 +0000 Subject: [PATCH 007/214] Merged PR 9319: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 5.0.0-preview.8.20372.8 to 5.0.0-preview.8.20373.3 (parent: Microsoft.WindowsDesktop.App) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:0f6854b1-351a-4b6e-c6c1-08d828f853f1) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 0f6854b1-351a-4b6e-c6c1-08d828f853f1 - **Build**: 20200723.2 - **Date Produced**: 7/23/2020 5:50 PM - **Commit**: ca45286487c7ea779e0a556a9ee969d18c59e629 - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.0-preview.8.20372.5 to 5.0.0-preview.8.20373.2 - **Microsoft.NET.Sdk.WindowsDesktop**: from 5.0.0-preview.8.20372.8 to 5.0.0-preview.8.20373.3 [DependencyUpdate]: <> (End) [marker]: <> (End:0f6854b1-351a-4b6e-c6c1-08d828f853f1) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81b62492eed2..5f6c8e99772b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8f6af76585edb55ce605ed6e747fdd7e8f98df78 + ca45286487c7ea779e0a556a9ee969d18c59e629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 77f4073a77883aeae77c732017ec3e1b85ec06c4 + 8fa19f65708bae2fb2a4fb8a29d99586dad90382 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e465c2629d08..80a8b74bebc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20372.8 + 5.0.0-preview.8.20373.3 - 5.0.0-preview.8.20372.5 + 5.0.0-preview.8.20373.2 From 57d58ac2d436f95756aab7bfdf31d3d6d1fe0ba7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 23 Jul 2020 20:54:31 +0000 Subject: [PATCH 008/214] Merged PR 9320: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:88823628-c5ab-474b-50a9-08d828f9655f) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 88823628-c5ab-474b-50a9-08d828f9655f - **Build**: 20200722.15 - **Date Produced**: 7/23/2020 1:15 AM - **Commit**: 2bac45c40d1a02c2418877721745b0e517f9290e - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.Sdk.Razor**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 - **Microsoft.AspNetCore.Analyzers**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 - **Microsoft.AspNetCore.Components.Analyzers**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 - **Microsoft.AspNetCore.Mvc.Analyzers**: from 5.0.0-preview.8.20364.16 to 5.0.0-preview.8.20372.15 [DependencyUpdate]: <> (End) [marker]: <> (End:88823628-c5ab-474b-50a9-08d828f9655f) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f6c8e99772b..93ac5b96fe91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7435f69531ae3bf6809d5e2939afdba4561c08bb - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 8fa19f65708bae2fb2a4fb8a29d99586dad90382 - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e - - https://github.com/dotnet/aspnetcore - 303a9bfe3312f1db51aa2ad5e354e3f484b41f00 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 2bac45c40d1a02c2418877721745b0e517f9290e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 80a8b74bebc3..a95300a84047 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20364.16 - 5.0.0-preview.8.20364.16 - 5.0.0-preview.8.20364.16 - 5.0.0-preview.8.20364.16 - 5.0.0-preview.8.20364.16 + 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20372.15 - 5.0.0-preview.8.20364.16 + 5.0.0-preview.8.20372.15 From fcdb39ff622a0cdf63a16a1f89746308f266dce1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Jul 2020 12:11:26 +0000 Subject: [PATCH 009/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20372.15 to 5.0.0-preview.8.20374.6 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48dc7a9185fd..ad13ecb64f7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 8f6d67beadd64b8404935147ed86cdff3d9925bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 8fa19f65708bae2fb2a4fb8a29d99586dad90382 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2bac45c40d1a02c2418877721745b0e517f9290e + 28270373feece52f0d59b51bf7d9687593376ce5 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 653eeb8a972c..b1f5fb60852d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20372.15 - 5.0.0-preview.8.20372.15 - 5.0.0-preview.8.20372.15 - 5.0.0-preview.8.20372.15 - 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20374.6 - 5.0.0-preview.8.20372.15 + 5.0.0-preview.8.20374.6 From cbd092a4ab2be46600884a2a2fd9dae43089ee69 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 28 Jul 2020 23:52:55 +0000 Subject: [PATCH 010/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime - Updates: - System.CodeDom: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - Microsoft.NET.HostModel: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - Microsoft.Extensions.DependencyModel: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - Microsoft.NETCore.App.Ref: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - System.Resources.Extensions: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - System.Security.Cryptography.ProtectedData: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 - System.Text.Encoding.CodePages: from 5.0.0-preview.8.20372.7 to 5.0.0-preview.8.20378.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0961ba3d3b63..656f7433344c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 096be35db97669a59b298168b2be30f9b43eab8a - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://github.com/dotnet/runtime - 3cab6dd440a5f3763bfbd2d582b36fe51095686a + e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 598e02ff5e9b..4a82c75f8ed9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20378.11 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20372.7 - 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20378.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20372.7 - 5.0.0-preview.8.20372.7 - 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20378.11 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20372.7 - 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20378.11 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20378.11 From 39d1dbb86ed90e28411d549fafbed04804e0b0b2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 29 Jul 2020 08:47:27 +0000 Subject: [PATCH 011/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20373.3 to 5.0.0-preview.8.20378.2 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20373.2 to 5.0.0-preview.8.20378.2 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20373.3 to 5.0.0-preview.8.20378.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5a7726ea547..6e0f532f26da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ca45286487c7ea779e0a556a9ee969d18c59e629 + 09dd65af8760d482ee6f8e9c192e3c346498ff6e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8fa19f65708bae2fb2a4fb8a29d99586dad90382 + b8c56fb64d3ffbb8c1d2b13c2dd65d4a0e4abfa2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f0a48f28e055..2e45f3e4ab21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20373.3 + 5.0.0-preview.8.20378.2 - 5.0.0-preview.8.20373.2 + 5.0.0-preview.8.20378.2 From 0973da24da37a98efa2d905d9c5e9700d72499c5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Jul 2020 01:29:49 +0000 Subject: [PATCH 012/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime - Updates: - System.CodeDom: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - Microsoft.NET.HostModel: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - Microsoft.Extensions.DependencyModel: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - Microsoft.NETCore.App.Ref: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - System.Resources.Extensions: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - System.Security.Cryptography.ProtectedData: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 - System.Text.Encoding.CodePages: from 5.0.0-preview.8.20378.11 to 5.0.0-preview.8.20379.8 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab89c1f52adc..c2312ca36bf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 096be35db97669a59b298168b2be30f9b43eab8a - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://github.com/dotnet/runtime - e26443ae490a9c292d22f0dc0dfc1fb7c9faaad2 + cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index a59207145c48..a4c3f2247c91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20379.8 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20378.11 - 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20379.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20378.11 - 5.0.0-preview.8.20378.11 - 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20379.8 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20378.11 - 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20379.8 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20378.11 + 5.0.0-preview.8.20379.8 From 5c765e0b4011562131480c85abaf1b16737b7174 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Jul 2020 03:35:47 +0000 Subject: [PATCH 013/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20374.6 to 5.0.0-preview.8.20379.11 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2312ca36bf3..b50ca95dec57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b8c56fb64d3ffbb8c1d2b13c2dd65d4a0e4abfa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 28270373feece52f0d59b51bf7d9687593376ce5 + f22aa719ba153912287bfbc64fa4d460e0847186 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a4c3f2247c91..e005a6357ac5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20374.6 - 5.0.0-preview.8.20374.6 - 5.0.0-preview.8.20374.6 - 5.0.0-preview.8.20374.6 - 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20379.11 - 5.0.0-preview.8.20374.6 + 5.0.0-preview.8.20379.11 From 1f2b52e1059158b906d36907d04213cb0b43ef0d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Jul 2020 05:10:15 +0000 Subject: [PATCH 014/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20378.2 to 5.0.0-preview.8.20379.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20378.2 to 5.0.0-preview.8.20379.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20378.2 to 5.0.0-preview.8.20379.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcabe8fcdad7..ccedc621dd29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 09dd65af8760d482ee6f8e9c192e3c346498ff6e + d9b6d9cf41b7860176b17ad9215291d9a3779e1a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b8c56fb64d3ffbb8c1d2b13c2dd65d4a0e4abfa2 + 21e3242c9d863c7316b70fa29c5441a60e54e7f4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 708f36d4d521..50f1519147ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20378.2 + 5.0.0-preview.8.20379.4 - 5.0.0-preview.8.20378.2 + 5.0.0-preview.8.20379.5 From f6b830f4b2dbb59029a8bfa14d09e65a49d43dc5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 30 Jul 2020 14:22:14 +0000 Subject: [PATCH 015/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20379.11 to 5.0.0-preview.8.20380.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 037326e8e5bc..f9e3632e2eab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 21e3242c9d863c7316b70fa29c5441a60e54e7f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f22aa719ba153912287bfbc64fa4d460e0847186 + 5dc9931a54e7992223625018ed10a0143ca78442 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6e1f326ec08d..9de6d42e3023 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20379.11 - 5.0.0-preview.8.20379.11 - 5.0.0-preview.8.20379.11 - 5.0.0-preview.8.20379.11 - 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20380.1 - 5.0.0-preview.8.20379.11 + 5.0.0-preview.8.20380.1 From c4e2dac630e63ecda9c616e1d81cece4f595c3d8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 1 Aug 2020 00:13:53 +0000 Subject: [PATCH 016/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20380.1 to 5.0.0-preview.8.20381.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08ae26b66ec8..81a7eb484c3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 21e3242c9d863c7316b70fa29c5441a60e54e7f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5dc9931a54e7992223625018ed10a0143ca78442 + fed19537a0440752b6d8595d8e3598da1fc133e6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 02f60c270b9d..e2c02f49197d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20380.1 - 5.0.0-preview.8.20380.1 - 5.0.0-preview.8.20380.1 - 5.0.0-preview.8.20380.1 - 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.4 - 5.0.0-preview.8.20380.1 + 5.0.0-preview.8.20381.4 From 41132fc86a49d4daa69af5c4602ebf8dbe083652 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 1 Aug 2020 02:51:52 +0000 Subject: [PATCH 017/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20381.4 to 5.0.0-preview.8.20381.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81a7eb484c3d..098f4d491a00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 21e3242c9d863c7316b70fa29c5441a60e54e7f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fed19537a0440752b6d8595d8e3598da1fc133e6 + d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index e2c02f49197d..47d4595168ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20381.4 - 5.0.0-preview.8.20381.4 - 5.0.0-preview.8.20381.4 - 5.0.0-preview.8.20381.4 - 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20381.7 - 5.0.0-preview.8.20381.4 + 5.0.0-preview.8.20381.7 From f4ffadf414d16791e0c40b575cd68d3513074635 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 1 Aug 2020 06:27:32 +0000 Subject: [PATCH 018/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime - Updates: - System.CodeDom: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - Microsoft.NET.HostModel: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - Microsoft.Extensions.DependencyModel: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - Microsoft.NETCore.App.Ref: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - System.Text.Encoding.CodePages: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - System.Resources.Extensions: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 - System.Security.Cryptography.ProtectedData: from 5.0.0-preview.8.20379.8 to 5.0.0-preview.8.20381.10 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 098f4d491a00..e5aa23ee15e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 096be35db97669a59b298168b2be30f9b43eab8a - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://github.com/dotnet/runtime - cfa1c371b2eb7e0a0a5947dc8e05c41f1bc2aba6 + 7b82cf110596ca9c41fd9a1c910df59595814ec4 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 47d4595168ed..7b84a302d121 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20381.10 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20379.8 - 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20381.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20379.8 - 5.0.0-preview.8.20379.8 - 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20381.10 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20379.8 - 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20381.10 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20379.8 + 5.0.0-preview.8.20381.10 From 611bc37999a04f3bd8610d591e6318c8d6c204c7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 3 Aug 2020 07:44:48 +0000 Subject: [PATCH 019/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20381.7 to 5.0.0-preview.8.20402.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54312214afbf..5ba012f0ebd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 21e3242c9d863c7316b70fa29c5441a60e54e7f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d2ccb4915ba7dc403afd7d6170cd76821c7ab0ea + 06fbd7e0c191740a45eaffca8a29468525f56acc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 4c0ed6d46e2d..80c4c2440383 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20381.7 - 5.0.0-preview.8.20381.7 - 5.0.0-preview.8.20381.7 - 5.0.0-preview.8.20381.7 - 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.4 - 5.0.0-preview.8.20381.7 + 5.0.0-preview.8.20402.4 From a916d92b8af4f4582bccc475f56e49e920984024 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 3 Aug 2020 10:04:14 +0000 Subject: [PATCH 020/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20379.4 to 5.0.0-preview.8.20402.2 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20379.5 to 5.0.0-preview.8.20402.2 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20379.4 to 5.0.0-preview.8.20402.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ba012f0ebd8..a90e6651fa9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d9b6d9cf41b7860176b17ad9215291d9a3779e1a + 1f5b82d3fa4f5ef0734c4d5b66e9d9e951628947 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 21e3242c9d863c7316b70fa29c5441a60e54e7f4 + 90621bb8b3ab61d0915ab15f8d323c5fedee5724 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 80c4c2440383..44a667e7d966 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20379.4 + 5.0.0-preview.8.20402.2 - 5.0.0-preview.8.20379.5 + 5.0.0-preview.8.20402.2 From ebb26c12264c250a5bec8fd567226b64fc1e5046 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 3 Aug 2020 13:01:52 +0000 Subject: [PATCH 021/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20402.4 to 5.0.0-preview.8.20402.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a90e6651fa9f..6bc10720db62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 90621bb8b3ab61d0915ab15f8d323c5fedee5724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 06fbd7e0c191740a45eaffca8a29468525f56acc + 3516b8d580794a4bdc9ba5726638bdc301364ece https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 44a667e7d966..9c3fcb464019 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20402.4 - 5.0.0-preview.8.20402.4 - 5.0.0-preview.8.20402.4 - 5.0.0-preview.8.20402.4 - 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20402.7 - 5.0.0-preview.8.20402.4 + 5.0.0-preview.8.20402.7 From 3a34adf23d25f76721eca9951865ec097997c52a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 5 Aug 2020 03:21:35 +0000 Subject: [PATCH 022/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20402.7 to 5.0.0-preview.8.20404.9 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddb5e975b12a..11766c28e4b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 7238563e5c051535770a9266c45d925012ad2b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 90621bb8b3ab61d0915ab15f8d323c5fedee5724 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3516b8d580794a4bdc9ba5726638bdc301364ece + 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5f5abd473725..989251da8814 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20402.7 - 5.0.0-preview.8.20402.7 - 5.0.0-preview.8.20402.7 - 5.0.0-preview.8.20402.7 - 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20404.9 - 5.0.0-preview.8.20402.7 + 5.0.0-preview.8.20404.9 From b9a8a9db33145e46ee6083f7fa6a5ac734969bb6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 7 Aug 2020 01:06:59 +0000 Subject: [PATCH 023/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.6 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.7 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.6 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 071f3095f7b8..4a472291a1fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1f5b82d3fa4f5ef0734c4d5b66e9d9e951628947 + b90ce35b1b4dc0948ddfc26b6778f50acf240e7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 90621bb8b3ab61d0915ab15f8d323c5fedee5724 + faf08443c812db0d5f64ff775d4817f4c7dd18df https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ce11783907d9..19b775f96f48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20402.2 + 5.0.0-preview.8.20406.6 - 5.0.0-preview.8.20402.2 + 5.0.0-preview.8.20406.7 From 6f9ad06e5e4d4a24fc0e93b4c74f3b29b0f5fed9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 7 Aug 2020 03:43:29 +0000 Subject: [PATCH 024/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.8 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.9 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20402.2 to 5.0.0-preview.8.20406.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a472291a1fa..0a17ac3dc4a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime 7b82cf110596ca9c41fd9a1c910df59595814ec4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b90ce35b1b4dc0948ddfc26b6778f50acf240e7e + fcdf87ca93bcbdfbd720341137d8eb5108889e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - faf08443c812db0d5f64ff775d4817f4c7dd18df + 306b0c8ba67adca230c47bb302a8427f249512ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 19b775f96f48..0147f48e8c32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20406.6 + 5.0.0-preview.8.20406.8 - 5.0.0-preview.8.20406.7 + 5.0.0-preview.8.20406.9 From febdc148ea606956d8cf6867b25232d1c5895250 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 8 Aug 2020 02:38:26 +0000 Subject: [PATCH 025/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-runtime - Updates: - System.CodeDom: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - Microsoft.NET.HostModel: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - Microsoft.Extensions.DependencyModel: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - Microsoft.NETCore.App.Ref: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - System.Text.Encoding.CodePages: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - System.Resources.Extensions: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 - System.Security.Cryptography.ProtectedData: from 5.0.0-preview.8.20381.10 to 5.0.0-preview.8.20407.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f99030fe071a..88c8b18fa3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,29 +5,29 @@ https://github.com/dotnet/templating 096be35db97669a59b298168b2be30f9b43eab8a - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 https://github.com/dotnet/arcade ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 https://github.com/dotnet/CliCommandLineParser @@ -69,21 +69,21 @@ https://github.com/mono/linker 3b524e4aa109ce5c8d9db5d6447386a0714d0d2d - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://github.com/dotnet/runtime - 7b82cf110596ca9c41fd9a1c910df59595814ec4 + bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 7e4f83ab603c..19f6a8c63f7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ 1.8.0 5.0.0-beta.20364.3 3.1.0 - 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20407.11 4.3.0 4.3.0 4.0.5 @@ -36,12 +36,12 @@ - 5.0.0-preview.8.20381.10 - 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20407.11 + 5.0.0-preview.8.20407.11 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.8.20381.10 - 5.0.0-preview.8.20381.10 - 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20407.11 + 5.0.0-preview.8.20407.11 + 5.0.0-preview.8.20407.11 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -72,10 +72,10 @@ - 5.0.0-preview.8.20381.10 - 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20407.11 + 5.0.0-preview.8.20407.11 5.0.0-preview.7.20307.4 - 5.0.0-preview.8.20381.10 + 5.0.0-preview.8.20407.11 From d4a39e86677065e41e033d17823ac423b2ae5520 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 8 Aug 2020 17:26:46 +0000 Subject: [PATCH 026/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20406.8 to 5.0.0-preview.8.20407.3 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App: from 5.0.0-preview.8.20406.9 to 5.0.0-preview.8.20407.3 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-preview.8.20406.8 to 5.0.0-preview.8.20407.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88c8b18fa3de..7d20301ebe02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fcdf87ca93bcbdfbd720341137d8eb5108889e5d + 966dab5996725c27bbc6db613715b756873d7b7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 306b0c8ba67adca230c47bb302a8427f249512ff + 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 19f6a8c63f7d..5230c6942482 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-preview.8.20406.8 + 5.0.0-preview.8.20407.3 - 5.0.0-preview.8.20406.9 + 5.0.0-preview.8.20407.3 From ec3c68b0677708f928549fe4112b73195a354d62 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 8 Aug 2020 17:37:40 +0000 Subject: [PATCH 027/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20404.9 to 5.0.0-preview.8.20407.17 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d20301ebe02..cb2a2539cfb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn dba2fa57432b4bd9cc7880e2c6fe3acdd01bba3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7f8e21fcb0b93113cf055b30c6108bfc04a3b09b + a1df872449f07a903a1356e0aad9b7a0fa720134 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5230c6942482..696757644a3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20404.9 - 5.0.0-preview.8.20404.9 - 5.0.0-preview.8.20404.9 - 5.0.0-preview.8.20404.9 - 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20407.17 - 5.0.0-preview.8.20404.9 + 5.0.0-preview.8.20407.17 From 5dd224d9ddcfb5486c1f54587b305b9866d6d9b4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 10 Aug 2020 15:57:15 +0000 Subject: [PATCH 028/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20407.17 to 5.0.0-preview.8.20410.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4a4f8c433e1..43a7561096a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 853dda9c22d7e8fa8303f19fa7ca40856bada322 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a1df872449f07a903a1356e0aad9b7a0fa720134 + 929a89b7a2bd8ebd4252251fbef5333a315ad385 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 288c2a5733cf..6b29e34cc889 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20407.17 - 5.0.0-preview.8.20407.17 - 5.0.0-preview.8.20407.17 - 5.0.0-preview.8.20407.17 - 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.2 - 5.0.0-preview.8.20407.17 + 5.0.0-preview.8.20410.2 From b0b3992ccf2ef435c33b53c38e5662f59bbfb37c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 10 Aug 2020 22:46:09 +0000 Subject: [PATCH 029/214] [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore - Updates: - Microsoft.AspNetCore.Analyzers: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 - Microsoft.NET.Sdk.Razor: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-preview.8.20410.2 to 5.0.0-preview.8.20410.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27d6061984e8..3599cfd8ba7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 853dda9c22d7e8fa8303f19fa7ca40856bada322 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 929a89b7a2bd8ebd4252251fbef5333a315ad385 + cb4a16a990758c995accdd1379f22f522d6f9f19 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 38be1906712f..2db1e202bd18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20410.2 - 5.0.0-preview.8.20410.2 - 5.0.0-preview.8.20410.2 - 5.0.0-preview.8.20410.2 - 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.5 - 5.0.0-preview.8.20410.2 + 5.0.0-preview.8.20410.5 From d8ffe949606757b4c15db4fea6ff01af89e669a5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 10 Aug 2020 23:31:44 +0000 Subject: [PATCH 030/214] Merged PR 9655: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:88823628-c5ab-474b-50a9-08d828f9655f) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 88823628-c5ab-474b-50a9-08d828f9655f - **Build**: 20200810.10 - **Date Produced**: 8/10/2020 10:42 PM - **Commit**: cb4a16a990758c995accdd1379f22f522d6f9f19 - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Analyzers**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 - **Microsoft.NET.Sdk.Razor**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 - **Microsoft.AspNetCore.Components.Analyzers**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 - **Microsoft.AspNetCore.Mvc.Analyzers**: from 5.0.0-preview.8.20410.5 to 5.0.0-preview.8.20410.10 [DependencyUpdate]: <> (End) [marker]: <> (End:88823628-c5ab-474b-50a9-08d828f9655f) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3599cfd8ba7d..77204bdda6ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,11 +49,11 @@ https://github.com/dotnet/roslyn 853dda9c22d7e8fa8303f19fa7ca40856bada322 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 @@ -93,19 +93,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore cb4a16a990758c995accdd1379f22f522d6f9f19 diff --git a/eng/Versions.props b/eng/Versions.props index 2db1e202bd18..765efb7b6ccd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,15 +115,15 @@ - 5.0.0-preview.8.20410.5 - 5.0.0-preview.8.20410.5 - 5.0.0-preview.8.20410.5 - 5.0.0-preview.8.20410.5 - 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20410.10 - 5.0.0-preview.8.20410.5 + 5.0.0-preview.8.20410.10 From fa03494f8fdd50207d5343e2881e36c7c493b653 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 11 Aug 2020 16:47:05 +0000 Subject: [PATCH 031/214] Merged PR 9675: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 5.0.0-preview.8.20407.3 to 5.0.0-preview.8.20411.7 (parent: Microsoft.WindowsDesktop.App) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:0f6854b1-351a-4b6e-c6c1-08d828f853f1) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 0f6854b1-351a-4b6e-c6c1-08d828f853f1 - **Build**: 20200811.6 - **Date Produced**: 8/11/2020 4:37 PM - **Commit**: 96bcf705df5a66cab1476e4c56332b9f67786808 - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.0-preview.8.20407.3 to 5.0.0-preview.8.20411.6 - **Microsoft.NET.Sdk.WindowsDesktop**: from 5.0.0-preview.8.20407.3 to 5.0.0-preview.8.20411.7 [DependencyUpdate]: <> (End) [marker]: <> (End:0f6854b1-351a-4b6e-c6c1-08d828f853f1) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79902d33d4b9..fd17a563614a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,13 +85,13 @@ https://github.com/dotnet/runtime bf456654f9a4f9a86c15d9d50095ff29cde5f0a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 966dab5996725c27bbc6db613715b756873d7b7b + 96bcf705df5a66cab1476e4c56332b9f67786808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1ad41fc1c26ad210c516db8d27e8d82359ca2ffc + e10dacc6153aaf020d87ee256e80eb6df796bcf8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b74ae7f769c2..7cd9a5b7e091 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,11 +128,11 @@ - 5.0.0-preview.8.20407.3 + 5.0.0-preview.8.20411.7 - 5.0.0-preview.8.20407.3 + 5.0.0-preview.8.20411.6 From 6248033e68b9c4d0c66970b2a0acdddb7878ec4a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Aug 2020 20:26:04 +0000 Subject: [PATCH 032/214] Merged PR 9695: [internal/release/5.0.1xx-preview8] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:88823628-c5ab-474b-50a9-08d828f9655f) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 88823628-c5ab-474b-50a9-08d828f9655f - **Build**: 20200812.3 - **Date Produced**: 8/12/2020 5:56 PM - **Commit**: b8e176e35c057b978c241a03ed22fc0fc6d14cc8 - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.Analyzers**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 - **Microsoft.NET.Sdk.Razor**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 - **Microsoft.AspNetCore.Components.Analyzers**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 - **Microsoft.AspNetCore.Mvc.Analyzers**: from 5.0.0-preview.8.20410.10 to 5.0.0-preview.8.20412.3 [DependencyUpdate]: <> (End) [marker]: <> (End:88823628-c5ab-474b-50a9-08d828f9655f) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5178bc2fff55..11d161e4a143 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 0cf3c978755f67779c847f0432d8696bbd54a43b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf e10dacc6153aaf020d87ee256e80eb6df796bcf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cb4a16a990758c995accdd1379f22f522d6f9f19 + b8e176e35c057b978c241a03ed22fc0fc6d14cc8 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2c92c0eebe23..6ca99ec72c8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -116,15 +116,15 @@ - 5.0.0-preview.8.20410.10 - 5.0.0-preview.8.20410.10 - 5.0.0-preview.8.20410.10 - 5.0.0-preview.8.20410.10 - 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20412.3 - 5.0.0-preview.8.20410.10 + 5.0.0-preview.8.20412.3 From e14684112077b65e8a8c5f1f0b5a4a6e70c7bcea Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Sat, 15 Aug 2020 09:33:57 +0000 Subject: [PATCH 033/214] Merged PR 9792: update aspnetcore update aspnetcore --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d88c835bab2a..e05e7ff51de8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/roslyn 71ffb7009993396ac20f9da007a79a62f2da43ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 https://github.com/NuGet/NuGet.Client @@ -93,21 +93,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf e10dacc6153aaf020d87ee256e80eb6df796bcf8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b8e176e35c057b978c241a03ed22fc0fc6d14cc8 + a4938d07a5127ffad8466ddf703a6b5b21f4b0c9 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 650830621ad3..9b30ac18fa4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -116,15 +116,15 @@ - 5.0.0-preview.8.20412.3 - 5.0.0-preview.8.20412.3 - 5.0.0-preview.8.20412.3 - 5.0.0-preview.8.20412.3 - 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20414.8 + 5.0.0-preview.8.20414.8 + 5.0.0-preview.8.20414.8 + 5.0.0-preview.8.20414.8 + 5.0.0-preview.8.20414.8 - 5.0.0-preview.8.20412.3 + 5.0.0-preview.8.20414.8 From 4dd10d54dead6f1a9da61427d1544268f1b9d5df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2020 05:13:14 +0000 Subject: [PATCH 034/214] Update dependencies from https://github.com/dotnet/fsharp build 20200818.2 (#12955) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20417.1 to 11.0.0-beta.20418.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13268024f32b..6bad4d9eed84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 870364a5d5627ef446303899e6df300be51dcba6 + 0dca81c98902f42e943eb03276798688231fc3c4 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2b849404c6d9..502d5d84c08b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20417.1 + 11.0.0-beta.20418.2 From 01d1fe2bcb1dc823e1b9222a69e1a1559441cb08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:47:07 +0000 Subject: [PATCH 035/214] Update dependencies from https://github.com/dotnet/fsharp build 20200818.3 (#12974) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20418.2 to 11.0.0-beta.20418.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bad4d9eed84..9571f48ea825 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 0dca81c98902f42e943eb03276798688231fc3c4 + f2f76773a0af22f5d07948d01ffd34667fcf7400 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 502d5d84c08b..fde4613b9eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20418.2 + 11.0.0-beta.20418.3 From 60cb2b8fffcd6024199e7b2fd047f0bac2c48df6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 08:20:32 +0000 Subject: [PATCH 036/214] Update dependencies from https://github.com/dotnet/fsharp build 20200819.4 (#12997) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20418.3 to 11.0.0-beta.20419.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9571f48ea825..25e2be2d8517 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - f2f76773a0af22f5d07948d01ffd34667fcf7400 + 7b510cf7529338b6897ad5c5f7fff8bc46af3b12 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fde4613b9eba..ca96dad0d0de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20418.3 + 11.0.0-beta.20419.4 From 25f2135c8a4a10433f127b5a5571f91bcce73a8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 12:54:12 +0000 Subject: [PATCH 037/214] Update dependencies from https://github.com/dotnet/fsharp build 20200820.1 (#12999) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20419.4 to 11.0.0-beta.20420.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25e2be2d8517..a5876566a40a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 7b510cf7529338b6897ad5c5f7fff8bc46af3b12 + 91c44399d02f6588a85c812d5814846ed709049d https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ca96dad0d0de..bb7d850c3b94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20419.4 + 11.0.0-beta.20420.1 From c2b3eeff5c7a61e044cab746a7468df84e529ab4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 01:30:10 +0000 Subject: [PATCH 038/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200820.13 (#13010) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 752d8949b1f0..f6bc32829807 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf b91ba697c48bc7825580e3c7fa09c5c3781c3788 - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d - + https://github.com/dotnet/aspnetcore - f490dd24c924e32acb46d0dee6b838237172d5e8 + c181218a4e065f64f94f19fc453b8d267f831f2d https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 43153d715f39..4bff3411bf22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 - 5.0.0-rc.1.20419.22 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.13 From f3c0e0fb78459e76249b9f617f7ba1b219c21bbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 02:33:39 +0000 Subject: [PATCH 039/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13009) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20417.3 to 5.0.0-rc.1.20420.1 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20417.3 to 5.0.0-rc.1.20420.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6bc32829807..37f22d39f872 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,21 +105,21 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + cb45f4d5f6df0e109a62965190e642be519b4b2b - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + cb45f4d5f6df0e109a62965190e642be519b4b2b - + https://github.com/dotnet/windowsdesktop - 85186023c8de8237268033cadc41d738b7f2005e + cb45f4d5f6df0e109a62965190e642be519b4b2b - + https://github.com/dotnet/wpf - b91ba697c48bc7825580e3c7fa09c5c3781c3788 + ad3a13c51d250df882d3106e7db4d4606073a7f5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4bff3411bf22..84aac9eccac9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20417.3 + 5.0.0-rc.1.20420.1 - 5.0.0-rc.1.20417.4 + 5.0.0-rc.1.20420.4 From 273a85fb9709c17f660082e127fe96bc1e4f9fc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 03:09:45 +0000 Subject: [PATCH 040/214] Update dependencies from https://github.com/dotnet/fsharp build 20200820.5 (#13013) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.1 to 11.0.0-beta.20420.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5876566a40a..03cd2ddcbc7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 91c44399d02f6588a85c812d5814846ed709049d + 2b6c6f9e1c24411ce7c9ebeb196ae9f9b772a998 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index bb7d850c3b94..7f842d95ef9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20420.1 + 11.0.0-beta.20420.5 From e68bdca84d18b12a223f3618b780d85dc6ba9b24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 03:19:42 +0000 Subject: [PATCH 041/214] Update dependencies from https://github.com/dotnet/fsharp build 20200820.5 (#13012) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.1 to 11.0.0-beta.20420.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37f22d39f872..a308df16be0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 91c44399d02f6588a85c812d5814846ed709049d + 2b6c6f9e1c24411ce7c9ebeb196ae9f9b772a998 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 84aac9eccac9..335d9b0e1366 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20420.1 + 11.0.0-beta.20420.5 From a56cb4c63e43ae43a8c065f69a3c1e036a033aa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 04:21:18 +0000 Subject: [PATCH 042/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200820.16 (#13015) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - dotnet-watch: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - dotnet-user-secrets: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - dotnet-dev-certs: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a308df16be0d..d83c6cb4300f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ad3a13c51d250df882d3106e7db4d4606073a7f5 - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf - + https://github.com/dotnet/aspnetcore - c181218a4e065f64f94f19fc453b8d267f831f2d + 9b5999f340fc64aac178ba5416e805a21e885fbf https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 335d9b0e1366..71200bc1c67d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 - 5.0.0-rc.1.20420.13 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.16 From c1c11f471778fb6a80fe04ce95088c0ac53b6e18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 07:01:52 +0000 Subject: [PATCH 043/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200820.18 (#13019) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - dotnet-watch: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - dotnet-user-secrets: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - dotnet-dev-certs: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d83c6cb4300f..1bd5efc5c1a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ad3a13c51d250df882d3106e7db4d4606073a7f5 - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e - + https://github.com/dotnet/aspnetcore - 9b5999f340fc64aac178ba5416e805a21e885fbf + a700662decce4056c23135b8a4e99b44179ea24e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 71200bc1c67d..dca0f1189faa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 - 5.0.0-rc.1.20420.16 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.18 From 39b1519127233c1db9ab6ffae8ac2a1305ee6c2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 08:00:49 +0000 Subject: [PATCH 044/214] Update dependencies from https://github.com/dotnet/fsharp build 20200820.6 (#13020) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.5 to 11.0.0-beta.20420.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bd5efc5c1a9..abceee725864 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 2b6c6f9e1c24411ce7c9ebeb196ae9f9b772a998 + ceb6b52d9f3f70449025f15a5df29eae158a67ca https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index dca0f1189faa..6a2b8d9079b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20420.5 + 11.0.0-beta.20420.6 From 8478f7f3d0436bfb9d09d5c4c30ff36dcb5d8ac8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 10:37:49 +0000 Subject: [PATCH 045/214] Update dependencies from https://github.com/dotnet/fsharp build 20200820.6 (#13021) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.5 to 11.0.0-beta.20420.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03cd2ddcbc7b..47a422d0b28c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 2b6c6f9e1c24411ce7c9ebeb196ae9f9b772a998 + ceb6b52d9f3f70449025f15a5df29eae158a67ca https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 7f842d95ef9b..738923348890 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20420.5 + 11.0.0-beta.20420.6 From 6e333bba63cc608cc6eda2c0ee57b56f9b987972 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 11:56:48 +0000 Subject: [PATCH 046/214] Update dependencies from https://github.com/microsoft/vstest build 20200821-01 (#13023) [release/5.0.1xx] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-preview-20200820-01 to 16.8.0-preview-20200821-01 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abceee725864..f404270f27a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ https://github.com/NuGet/NuGet.Client 62e098bfb22998fa638ce1a6dff5f91276770500 - + https://github.com/microsoft/vstest - b661b07828a9279cb6ee331cb1aea9ddc07c62f5 + fd2748bbdec952add4bf895fe45c6b1016a26480 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6a2b8d9079b4..13eb8a0ee209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ - 16.8.0-preview-20200820-01 + 16.8.0-preview-20200821-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 1e822d6b1e45ce936231d18a29fd316c6bb0d95b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 07:57:34 -0700 Subject: [PATCH 047/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13022) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200820.20 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20420.18 -> To Version 5.0.0-rc.1.20420.20 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200820.22 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20420.20 -> To Version 5.0.0-rc.1.20420.22 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f404270f27a0..6ab609067ee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ad3a13c51d250df882d3106e7db4d4606073a7f5 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 - + https://github.com/dotnet/aspnetcore - a700662decce4056c23135b8a4e99b44179ea24e + 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 13eb8a0ee209..6f96d4b13243 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 - 5.0.0-rc.1.20420.18 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20420.22 From c4d0e1ec51d432f2134a0bb918171a7e97dfa76c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 16:16:47 +0000 Subject: [PATCH 048/214] Update dependencies from https://github.com/microsoft/vstest build 20200821-04 (#13032) [release/5.0.1xx] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-preview-20200821-01 to 16.8.0-release-20200821-04 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ab609067ee0..d351a36d9b73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ https://github.com/NuGet/NuGet.Client 62e098bfb22998fa638ce1a6dff5f91276770500 - + https://github.com/microsoft/vstest - fd2748bbdec952add4bf895fe45c6b1016a26480 + f5e870bd4f3402c9e6e71679f8d0b716653143f5 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 6f96d4b13243..8ad2ee20a2ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ - 16.8.0-preview-20200821-01 + 16.8.0-release-20200821-04 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 36889dd0655563289d289ab7ebdd3e1178582808 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 16:54:22 +0000 Subject: [PATCH 049/214] Update dependencies from https://github.com/mono/linker build 20200820.3 (#13033) [release/5.0.1xx] Update dependencies from mono/linker - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-preview.3.20418.3 to 5.0.0-rc.1.20420.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d351a36d9b73..cd9729ea3bb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ https://github.com/microsoft/vstest f5e870bd4f3402c9e6e71679f8d0b716653143f5 - + https://github.com/mono/linker - 7eae638feafc7dc766f51f440e760220707a87ad + e56c9e47031302a164912b0eb9f0c94c9d307290 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8ad2ee20a2ff..e7f7cbad37a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ - 5.0.0-preview.3.20418.3 + 5.0.0-rc.1.20420.3 From 2c57cbf7e04746029dfcab00494d224c8138e87f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 16:58:55 +0000 Subject: [PATCH 050/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200820.6 (#13018) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20420.1 to 5.0.0-rc.1.20420.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20420.1 to 5.0.0-rc.1.20420.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd9729ea3bb0..4dc59ba64aa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,21 +105,21 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/windowsdesktop - cb45f4d5f6df0e109a62965190e642be519b4b2b + 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + https://github.com/dotnet/windowsdesktop - cb45f4d5f6df0e109a62965190e642be519b4b2b + 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + https://github.com/dotnet/windowsdesktop - cb45f4d5f6df0e109a62965190e642be519b4b2b + 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + https://github.com/dotnet/wpf - ad3a13c51d250df882d3106e7db4d4606073a7f5 + 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e7f7cbad37a2..8b6fc4fce2c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20420.1 + 5.0.0-rc.1.20420.4 - 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20420.6 From dc1c62094d5a79e761d4890f11a19c7f53ca443e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Aug 2020 17:28:16 +0000 Subject: [PATCH 051/214] Update dependencies from https://github.com/dotnet/templating build 20200821.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.TemplateEngine.Cli From Version 5.0.0-rc.1.20419.1 -> To Version 5.0.0-rc.1.20421.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc59ba64aa4..d64427f08250 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 6a10ce799f42102bee8f8bec9a52c42cca6ed272 + 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/templating - 6a10ce799f42102bee8f8bec9a52c42cca6ed272 + 8964302e878d00a0161df0ce1c42c535316e339d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8b6fc4fce2c4..9885de664497 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 5.0.0-rc.1.20419.1 + 5.0.0-rc.1.20421.3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 17a27bf19fe22924114c57b4833d6952a11efb8c Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Aug 2020 13:08:11 -0700 Subject: [PATCH 052/214] Tolerate empty manifest folder --- src/Cli/dotnet/dotnet.csproj | 2 ++ .../TemplateLocator.cs | 8 +++++++- .../GivenAnTemplateLocator.cs | 13 +++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index fb881dbf6f1d..05b1b3d536b5 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -59,6 +59,8 @@ + + diff --git a/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs b/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs index e7f1e3afd429..ea897764d760 100644 --- a/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs +++ b/src/Microsoft.DotNet.TemplateLocator/TemplateLocator.cs @@ -55,7 +55,13 @@ bool FindSameVersionBand(DirectoryInfo manifestDirectory) (directoryVersion.Revision / 100) == (sdkVersionParsed.Revision / 100); } - var bondManifestDirectory = new DirectoryInfo(Path.Combine(dotnetRootPath, "workloadmanifests")).GetDirectories().Where(FindSameVersionBand) + var manifestsDirectory = Path.Combine(dotnetRootPath, "workloadmanifests"); + if (!Directory.Exists(manifestsDirectory)) + { + return Array.Empty(); + } + + var bondManifestDirectory = new DirectoryInfo(manifestsDirectory).GetDirectories().Where(FindSameVersionBand) .OrderByDescending(d => Version.Parse(d.Name)).FirstOrDefault(); if (bondManifestDirectory == null) diff --git a/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs b/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs index 618b4618646e..83549463c33c 100644 --- a/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs +++ b/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs @@ -43,7 +43,7 @@ public void ItShouldReturnListOfTemplates() } [Fact] - public void WhenPassEmptyManifestItShouldReturnListOfTemplates() + public void WhenPassEmptyManifestItShouldReturnEmpty() { File.WriteAllText(Path.Combine(_manifestDirectory, "WorkloadManifest.xml"), emptyManifest); var result = _resolver.GetDotnetSdkTemplatePackages("5.0.102", _fakeDotnetRootDirectory); @@ -51,13 +51,22 @@ public void WhenPassEmptyManifestItShouldReturnListOfTemplates() } [Fact] - public void GivenNoSdkToBondItShouldReturnListOfTemplates() + public void GivenNoSdkToBondItShouldReturnEmpty() { File.WriteAllText(Path.Combine(_manifestDirectory, "WorkloadManifest.xml"), fakeManifest); var result = _resolver.GetDotnetSdkTemplatePackages("5.1.102", _fakeDotnetRootDirectory); result.Should().BeEmpty(); } + [Fact] + public void GivenNoNanifestDirectoryItShouldReturnEmpty() + { + var fakeDotnetRootDirectory = + Path.Combine(TestContext.Current.TestExecutionDirectory, Path.GetRandomFileName()); + var result = _resolver.GetDotnetSdkTemplatePackages("5.1.102", fakeDotnetRootDirectory); + result.Should().BeEmpty(); + } + private static string fakeManifest = @" From db5f985f1e259e5275a1c398ac547ae991016c43 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Aug 2020 13:13:14 -0700 Subject: [PATCH 053/214] Format slash --- src/Cli/dotnet/dotnet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 05b1b3d536b5..1e9cb3f83921 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -60,7 +60,7 @@ - + From e214ee3ded1e53e32d6b4e68b1f3d40216d97868 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Aug 2020 13:38:30 -0700 Subject: [PATCH 054/214] Correct typo --- .../GivenAnTemplateLocator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs b/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs index 83549463c33c..b9803062842d 100644 --- a/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs +++ b/src/Tests/Microsoft.DotNet.TemplateLocator.Tests/GivenAnTemplateLocator.cs @@ -59,7 +59,7 @@ public void GivenNoSdkToBondItShouldReturnEmpty() } [Fact] - public void GivenNoNanifestDirectoryItShouldReturnEmpty() + public void GivenNoManifestDirectoryItShouldReturnEmpty() { var fakeDotnetRootDirectory = Path.Combine(TestContext.Current.TestExecutionDirectory, Path.GetRandomFileName()); From a2e13a92f287b2ab596aab8fda65c44718466d6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 21:40:31 +0000 Subject: [PATCH 055/214] Update dependencies from https://github.com/dotnet/arcade build 20200819.21 (#13036) [release/5.0.1xx] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.XUnitExtensions: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.SignTool: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20417.6 to 5.0.0-beta.20419.21 --- eng/Version.Details.xml | 16 +- eng/Versions.props | 4 +- eng/common/performance/performance-setup.sh | 5 +- eng/common/post-build/publish-using-darc.ps1 | 23 +- .../channels/generic-internal-channel.yml | 6 + .../channels/generic-public-channel.yml | 6 + .../templates/post-build/post-build.yml | 395 ++++++++++-------- .../post-build/setup-maestro-vars.yml | 28 +- global.json | 4 +- 9 files changed, 277 insertions(+), 210 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc59ba64aa4..31748b9ccff2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + 56a95cc477558c1ccdf16d7abe962849ea970ba4 https://github.com/dotnet/runtime @@ -167,17 +167,17 @@ - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + 56a95cc477558c1ccdf16d7abe962849ea970ba4 diff --git a/eng/Versions.props b/eng/Versions.props index 8b6fc4fce2c4..63161f58efe6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 1.8.0 - 5.0.0-beta.20417.6 + 5.0.0-beta.20419.21 3.1.0 5.0.0-rc.1.20417.14 4.3.0 @@ -141,7 +141,7 @@ 4.19.2 4.19.0 - 5.0.0-beta.20417.6 + 5.0.0-beta.20419.21 .exe diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index fd26bdb1735f..65a9d8fc6193 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -199,14 +199,15 @@ if [[ "$mono_dotnet" != "" ]]; then fi if [[ "$wasm_runtime_loc" != "" ]]; then - configurations="CompilationMode=wasm;RunKind=micro" + configurations="CompilationMode=wasm RunKind=micro" + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM" fi if [[ "$monointerpreter" == "true" ]]; then extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter" fi -common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs \"$configurations\" --architecture $architecture" +common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture" setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d22eb439c486..f044afe8fc63 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -1,12 +1,13 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, + [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, - [Parameter(Mandatory=$true)][string] $EnableSourceLinkValidation, - [Parameter(Mandatory=$true)][string] $EnableSigningValidation, - [Parameter(Mandatory=$true)][string] $EnableNugetValidation, + [Parameter(Mandatory=$false)][string] $EnableSourceLinkValidation, + [Parameter(Mandatory=$false)][string] $EnableSigningValidation, + [Parameter(Mandatory=$false)][string] $EnableNugetValidation, [Parameter(Mandatory=$true)][string] $PublishInstallersAndChecksums, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters @@ -14,7 +15,8 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - . $PSScriptRoot\..\darc-init.ps1 + # Hard coding darc version till the next arcade-services roll out, cos this version has required API changes for darc add-build-to-channel + . $PSScriptRoot\..\darc-init.ps1 -darcVersion "1.1.0-beta.20418.1" $optionalParams = [System.Collections.ArrayList]::new() @@ -49,12 +51,13 @@ try { } & darc add-build-to-channel ` - --id $buildId ` - --default-channels ` - --source-branch master ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch master ` + --azdev-pat $AzdoToken ` + --bar-uri $MaestroApiEndPoint ` + --password $MaestroToken ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 12db36ebe74f..59eb93a407cb 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,4 +1,6 @@ parameters: + BARBuildId: '' + PromoteToChannelIds: '' artifactsPublishingAdditionalParameters: '' dependsOn: - Validate @@ -19,6 +21,9 @@ stages: displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - job: publish_symbols displayName: Symbol Publishing @@ -138,6 +143,7 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:PublishingInfraVersion=2 /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index bf98d990e88e..7e80a621a303 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,4 +1,6 @@ parameters: + BARBuildId: '' + PromoteToChannelIds: '' artifactsPublishingAdditionalParameters: '' dependsOn: - Validate @@ -21,6 +23,9 @@ stages: displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - job: publish_symbols displayName: Symbol Publishing @@ -137,6 +142,7 @@ stages: inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:PublishingInfraVersion=2 /p:ArtifactsCategory=$(ArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index e814d5e0334a..030808632f05 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,13 +1,20 @@ parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V2 accepts optionally outlining the publishing stages - default is inline. + # Publishing V3 DOES NOT accept inlining the publishing stages. + publishingInfraVersion: 2 # When set to true the publishing templates from the repo will be used # otherwise Darc add-build-to-channel will be used to trigger the promotion pipeline inline: true # Only used if inline==false. When set to true will stall the current build until - # the Promotion Pipeline build finishes. Otherwise, the current build continue + # the Promotion Pipeline build finishes. Otherwise, the current build will continue # execution concurrently with the promotion build. waitPublishingFinish: true + BARBuildId: '' + PromoteToChannelIds: '' + enableSourceLinkValidation: false enableSigningValidation: true enableSymbolValidation: false @@ -59,14 +66,183 @@ parameters: VSMasterChannelId: 1012 stages: -- ${{ if ne(parameters.inline, 'true') }}: +- stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + jobs: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - job: + displayName: Post-build Checks + dependsOn: setupMaestroVars + variables: + - name: TargetChannels + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: PowerShell@2 + displayName: Maestro Channels Consistency + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 + arguments: -PromoteToChannels "$(TargetChannels)" + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} + + - job: + displayName: NuGet Validation + dependsOn: setupMaestroVars + condition: eq( ${{ parameters.enableNugetValidation }}, 'true') + pool: + vmImage: 'windows-2019' + variables: + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + dependsOn: setupMaestroVars + condition: eq( ${{ parameters.enableSigningValidation }}, 'true') + variables: + - template: common-variables.yml + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - ${{ if eq(parameters.useBuildManifest, true) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download build manifest + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BuildManifests + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + + - job: + displayName: SourceLink Validation + dependsOn: setupMaestroVars + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + variables: + - template: common-variables.yml + - name: AzDOProjectName + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] + - name: AzDOPipelineId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] + - name: AzDOBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + + - template: /eng/common/templates/job/execute-sdl.yml + parameters: + enable: ${{ parameters.SDLValidationParameters.enable }} + dependsOn: setupMaestroVars + additionalParameters: ${{ parameters.SDLValidationParameters.params }} + continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} + downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} + +- ${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}: - stage: publish_using_darc - dependsOn: ${{ parameters.validateDependsOn }} + dependsOn: Validate displayName: Publish using Darc variables: - template: common-variables.yml jobs: - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - job: displayName: Publish Using Darc @@ -82,182 +258,17 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.PublishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish ${{ parameters.waitPublishingFinish }} - -EnableSourceLinkValidation ${{ parameters.enableSourceLinkValidation }} - -EnableSigningValidation ${{ parameters.enableSourceLinkValidation }} - -EnableNugetValidation ${{ parameters.enableSourceLinkValidation }} -PublishInstallersAndChecksums ${{ parameters.publishInstallersAndChecksums }} - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SigningValidationAdditionalParameters '${{ parameters.signingValidationAdditionalParameters }}' - -- ${{ if eq(parameters.inline, 'true') }}: - - stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - jobs: - - template: setup-maestro-vars.yml - - - job: - displayName: Post-build Checks - dependsOn: setupMaestroVars - variables: - - name: TargetChannels - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.TargetChannels'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: PowerShell@2 - displayName: Maestro Channels Consistency - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 - arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - - - job: - displayName: NuGet Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableNugetValidation }}, 'true') - pool: - vmImage: 'windows-2019' - variables: - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableSigningValidation }}, 'true') - variables: - - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - ${{ if eq(parameters.useBuildManifest, true) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download build manifest - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BuildManifests - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - - - job: - displayName: SourceLink Validation - dependsOn: setupMaestroVars - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - variables: - - template: common-variables.yml - - name: AzDOProjectName - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ] - - name: AzDOPipelineId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ] - - name: AzDOBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ] - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} - dependsOn: setupMaestroVars - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} +- ${{ if and(le(parameters.publishingInfraVersion, 2), eq(parameters.inline, 'true')) }}: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -272,6 +283,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -286,6 +299,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -300,6 +315,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -314,6 +331,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -328,6 +347,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -342,6 +363,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -356,6 +379,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -369,6 +394,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -382,6 +409,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -395,6 +424,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -408,6 +439,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -421,6 +454,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -434,6 +469,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -447,6 +484,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -460,6 +499,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -473,6 +514,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -486,6 +529,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -499,6 +544,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -512,6 +559,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -525,6 +574,8 @@ stages: - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index b3d29d4498e3..d0cbfb6c6ffd 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -1,25 +1,23 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + jobs: - job: setupMaestroVars displayName: Setup Maestro Vars variables: - template: common-variables.yml - - name: BuildId - value: $[ coalesce(variables.BARBuildId, 0) ] - - name: PromoteToMaestroChannels - value: $[ coalesce(variables.PromoteToChannelIds, 0) ] - - name: PromoteToMaestroChannel - value: $[ coalesce(variables.PromoteToMaestroChannelId, 0) ] pool: vmImage: 'windows-2019' steps: - checkout: none - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - condition: and(eq(variables.PromoteToMaestroChannels, 0), eq(variables.PromoteToMaestroChannel, 0)) - inputs: - buildType: current - artifactName: ReleaseConfigs + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs - task: PowerShell@2 name: setReleaseVars @@ -28,7 +26,7 @@ jobs: targetType: inline script: | try { - if ($Env:PromoteToMaestroChannels -eq 0 -and $Env:PromoteToMaestroChannel -eq 0) { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 @@ -51,7 +49,7 @@ jobs: $BarId = $Env:BARBuildId $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" - $Channels = "[$Channels][$Env:PromoteToMaestroChannel]" + $Channels = "[$Channels]" $IsStableBuild = $buildInfo.stable $AzureDevOpsProject = $buildInfo.azureDevOpsProject @@ -75,3 +73,5 @@ jobs: } env: MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/global.json b/global.json index 8dac30116624..0f3bd14da2dd 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20419.21" } } From c83a1cafb920bf325b5353ebe169aa576f30641c Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 21 Aug 2020 15:05:54 -0700 Subject: [PATCH 056/214] Adjust assertion --- src/Tests/dotnet-new.Tests/NewCommandTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet-new.Tests/NewCommandTests.cs b/src/Tests/dotnet-new.Tests/NewCommandTests.cs index 82ccf91738d9..3058ace07532 100644 --- a/src/Tests/dotnet-new.Tests/NewCommandTests.cs +++ b/src/Tests/dotnet-new.Tests/NewCommandTests.cs @@ -25,7 +25,7 @@ public void WhenSwitchIsSkippedThenItPrintsError() if (!TestContext.IsLocalized()) { - cmd.StdErr.Should().StartWith("No templates found matching the following input parameter(s): 'Web1.1'."); + cmd.StdErr.Should().StartWith("No templates found"); } } From 9e152f2ac0bcdbfbec717efd12b5b4d3e8debf92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 02:28:02 +0000 Subject: [PATCH 057/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13038) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - dotnet-watch: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - dotnet-user-secrets: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - dotnet-dev-certs: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21f93b18d320..7fde949d7dd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 - + https://github.com/dotnet/aspnetcore - 3e8c5c48f0304705e2ed88f3b34f9c74626e1487 + 50815ed5980250391771560077da1d3333cc6524 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1a84a3ec81d4..dad49ba37ef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 - 5.0.0-rc.1.20420.22 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.8 From a5c3ef1f1fdbc749db30973f65b46c94b0dec877 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 03:01:52 +0000 Subject: [PATCH 058/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.4 (#13043) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.6 to 11.0.0-beta.20421.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fde949d7dd2..9883138ac9f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - ceb6b52d9f3f70449025f15a5df29eae158a67ca + 8f4653cc81ed244f18cc3886dc193b0072cd77f3 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index dad49ba37ef7..f31888488b4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20420.6 + 11.0.0-beta.20421.4 From d225b06ee8a4b9b000f4d95b6831e226c9cb94e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 03:01:54 +0000 Subject: [PATCH 059/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.4 (#13042) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20420.6 to 11.0.0-beta.20421.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47a422d0b28c..3258ab04e686 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - ceb6b52d9f3f70449025f15a5df29eae158a67ca + 8f4653cc81ed244f18cc3886dc193b0072cd77f3 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 738923348890..aa5fc80f364d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20420.6 + 11.0.0-beta.20421.4 From 4327879c3bac889dc20b10acc84157393f6ab004 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 05:43:35 +0000 Subject: [PATCH 060/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13011) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - System.Resources.Extensions: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9883138ac9f8..5e7e81402057 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index f31888488b4f..0c04fc2e76de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20417.14 - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 From 8de581e6ca961c9e8234b6651cec43657ed6174f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 05:48:11 +0000 Subject: [PATCH 061/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.5 (#13046) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20421.4 to 11.0.0-beta.20421.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e7e81402057..640512f6fd9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 8f4653cc81ed244f18cc3886dc193b0072cd77f3 + 676b68a417564cb4587b0b2631daf86d6755c5a5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0c04fc2e76de..7811b33690b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20421.4 + 11.0.0-beta.20421.5 From 4b8af1125cf7445e349e7a0fff2b061f068316ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 05:48:18 +0000 Subject: [PATCH 062/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.5 (#13045) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20421.4 to 11.0.0-beta.20421.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3258ab04e686..0afccdbdd124 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 8f4653cc81ed244f18cc3886dc193b0072cd77f3 + 676b68a417564cb4587b0b2631daf86d6755c5a5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index aa5fc80f364d..f62c05d94f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20421.4 + 11.0.0-beta.20421.5 From 0a3bbf6468f25706584ea92c9ce84fc1b44a6bd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 08:19:10 +0000 Subject: [PATCH 063/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13044) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - dotnet-watch: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - dotnet-user-secrets: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - dotnet-dev-certs: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 640512f6fd9d..3c1d3212ba7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a - + https://github.com/dotnet/aspnetcore - 50815ed5980250391771560077da1d3333cc6524 + 134850b4a2e98410e742173c8d2da740e0808b6a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 7811b33690b8..1b0fe24196d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 - 5.0.0-rc.1.20421.8 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20421.10 From e73d96f0d3b55e1e5757d47f4d6487b66d9e4da6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 08:35:43 +0000 Subject: [PATCH 064/214] Update dependencies from https://github.com/dotnet/runtime build 20200821.18 (#13047) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - System.Resources.Extensions: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c1d3212ba7a..3d8ca1b421ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 1b0fe24196d5..13ec36bbd37f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20421.14 - 5.0.0-rc.1.20421.14 - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20421.14 - 5.0.0-rc.1.20421.14 - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20421.14 - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 From 03637e15b9dba361239e00541162bc405d8ea0d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 09:10:25 +0000 Subject: [PATCH 065/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.7 (#13048) [release/5.0.1xx-preview8] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20421.5 to 11.0.0-beta.20421.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0afccdbdd124..875c2e62ab14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,9 +41,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 676b68a417564cb4587b0b2631daf86d6755c5a5 + 255ff6b1407ba44da24596e094da5fde80e68a12 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index f62c05d94f90..841e10f26018 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ - 11.0.0-beta.20421.5 + 11.0.0-beta.20421.7 From bfab73a3dc778ad744b3d44cd941db351473db69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 09:30:32 +0000 Subject: [PATCH 066/214] Update dependencies from https://github.com/dotnet/fsharp build 20200821.7 (#13049) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20421.5 to 11.0.0-beta.20421.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d8ca1b421ab..fb57454d4934 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 676b68a417564cb4587b0b2631daf86d6755c5a5 + 255ff6b1407ba44da24596e094da5fde80e68a12 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 13ec36bbd37f..12d1ca322162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20421.5 + 11.0.0-beta.20421.7 From 51251a9f21656d1e275cd2410375fc8c1b195918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 02:24:29 +0000 Subject: [PATCH 067/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13050) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - dotnet-watch: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - dotnet-user-secrets: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - dotnet-dev-certs: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb57454d4934..b03fb95d4cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 - + https://github.com/dotnet/aspnetcore - 134850b4a2e98410e742173c8d2da740e0808b6a + 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 12d1ca322162..ee1bd3166fb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 - 5.0.0-rc.1.20421.10 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.4 From 1082ff941cf5fa4b9bdff103827c16a81bb6a565 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 03:47:45 +0000 Subject: [PATCH 068/214] Update dependencies from https://github.com/dotnet/fsharp build 20200822.2 (#13058) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20421.7 to 11.0.0-beta.20422.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b03fb95d4cd6..730aa793151f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 255ff6b1407ba44da24596e094da5fde80e68a12 + 29c636ca84811a4d9973e47846d91d20db369a0a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ee1bd3166fb0..962c431fac43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20421.7 + 11.0.0-beta.20422.2 From 555efe44c424147557c4310b3ba79693b8227ee1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 04:49:57 +0000 Subject: [PATCH 069/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200822.5 (#13059) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - dotnet-watch: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - dotnet-user-secrets: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - dotnet-dev-certs: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20422.4 to 5.0.0-rc.1.20422.5 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 730aa793151f..598a9b4c5e1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e - + https://github.com/dotnet/aspnetcore - 135e8e6ffeb7c1867851bbc8849535cba65ab0a2 + 7304bd52338416a86d656acf59a79a68f23d0f7e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 962c431fac43..cb67fdfffd61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 - 5.0.0-rc.1.20422.4 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.5 From b0cdca64e59eb0bce49f43d566219812b83ec209 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 07:08:58 +0000 Subject: [PATCH 070/214] Update dependencies from https://github.com/dotnet/fsharp build 20200822.4 (#13060) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20422.2 to 11.0.0-beta.20422.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 598a9b4c5e1e..aed74337b989 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild df645299a158c787f9884fca2bcd8c295318193f - + https://github.com/dotnet/fsharp - 29c636ca84811a4d9973e47846d91d20db369a0a + b4ca4304b24cdf33e755bc0cf8795c91bcc3a5a8 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index cb67fdfffd61..90e644c39e09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20422.2 + 11.0.0-beta.20422.4 From aca6331bff50fc1d03e3531260a08a7ba2871fce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 09:17:13 +0000 Subject: [PATCH 071/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200822.7 (#13061) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - dotnet-watch: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - dotnet-user-secrets: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - dotnet-dev-certs: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aed74337b989..06bdd015a093 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 - + https://github.com/dotnet/aspnetcore - 7304bd52338416a86d656acf59a79a68f23d0f7e + cf0f7efa9c231f83e6b51b1733e65679d8c0a823 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 90e644c39e09..30751445c422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 - 5.0.0-rc.1.20422.5 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20422.7 From 5997452539d2e0f9580ce6a3bb78d525437502e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 11:30:52 +0000 Subject: [PATCH 072/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200823.1 (#13062) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20423.1 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20423.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06bdd015a093..c2e562bc419b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,21 +105,21 @@ https://github.com/dotnet/runtime c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + https://github.com/dotnet/windowsdesktop - 5cacc6c2996fb2af2d203f2594934c95a06bc96c + 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b - + https://github.com/dotnet/windowsdesktop - 5cacc6c2996fb2af2d203f2594934c95a06bc96c + 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b - + https://github.com/dotnet/windowsdesktop - 5cacc6c2996fb2af2d203f2594934c95a06bc96c + 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b - + https://github.com/dotnet/wpf - 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 + ef7880b7a27805df56394c365c7b114847f9dd49 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 30751445c422..48dabb780a9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20423.1 - 5.0.0-rc.1.20420.6 + 5.0.0-rc.1.20423.1 From aab4b1da251cde171371509de7eb809581358b74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 06:37:07 -0700 Subject: [PATCH 073/214] Update dependencies from https://github.com/dotnet/runtime build 20200822.6 (#13055) System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Resources.Extensions , System.Security.Cryptography.ProtectedData From Version 5.0.0-rc.1.20421.18 -> To Version 5.0.0-rc.1.20422.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2e562bc419b..6766a17fabe3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 48dabb780a9c..806d7c87b6cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20421.18 - 5.0.0-rc.1.20421.18 - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20421.18 - 5.0.0-rc.1.20421.18 - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20421.18 - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 From 8f1b8a7a884b5948c9951ba87278e77345bac626 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 22:13:40 +0000 Subject: [PATCH 074/214] Update dependencies from https://github.com/dotnet/runtime build 20200823.4 (#13064) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - System.Resources.Extensions: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6766a17fabe3..bcc1ee4c628e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 806d7c87b6cf..3e2404dfca53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20422.6 - 5.0.0-rc.1.20422.6 - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20422.6 - 5.0.0-rc.1.20422.6 - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20422.6 - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 From 49853672f22ca620439d5bba5323a65a41a6c67f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 00:29:49 +0000 Subject: [PATCH 075/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.2 (#13066) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - dotnet-watch: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - dotnet-user-secrets: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - dotnet-dev-certs: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.2 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bcc1ee4c628e..0cbda320cfeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ef7880b7a27805df56394c365c7b114847f9dd49 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 26583ac5b7c1220016844de5d0e10820a548932e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 3e2404dfca53..2a91fb487719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 - 5.0.0-rc.1.20422.7 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.2 From 515d87840a06abe81c90b2f40e7094004b443689 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 03:05:00 +0000 Subject: [PATCH 076/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.3 (#13067) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - dotnet-watch: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - dotnet-user-secrets: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - dotnet-dev-certs: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20423.2 to 5.0.0-rc.1.20423.3 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cbda320cfeb..d53318f50cbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ef7880b7a27805df56394c365c7b114847f9dd49 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - 26583ac5b7c1220016844de5d0e10820a548932e + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2a91fb487719..d5f7d9ae904c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 - 5.0.0-rc.1.20423.2 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.3 From 2cd2370ffa6ec52031b661594c1c4cf483cc2447 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 05:32:41 +0000 Subject: [PATCH 077/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.5 (#13068) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - dotnet-watch: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - dotnet-user-secrets: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - dotnet-dev-certs: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d53318f50cbd..ab8a9bf5de33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf ef7880b7a27805df56394c365c7b114847f9dd49 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 - + https://github.com/dotnet/aspnetcore - 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 + a59639714eda52c08b7cb0326af7e2a9cffde623 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d5f7d9ae904c..e1039c1262af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 - 5.0.0-rc.1.20423.3 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20423.5 From bced0b96a6e9ae3159fc8fe4bab84f3b717d14b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:11:05 +0000 Subject: [PATCH 078/214] Update dependencies from https://github.com/dotnet/runtime build 20200823.8 (#13070) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - System.Resources.Extensions: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab8a9bf5de33..1831c61a6640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index e1039c1262af..392c8f9db24e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20423.4 - 5.0.0-rc.1.20423.4 - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20423.4 - 5.0.0-rc.1.20423.4 - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20423.4 - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 From 72d99cc3f02c1f2f7835bd3048a86f572d0e180e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 13:46:23 +0000 Subject: [PATCH 079/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200824.1 (#13072) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1831c61a6640..c5b0b2ba97dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,21 +105,21 @@ https://github.com/dotnet/runtime 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + https://github.com/dotnet/windowsdesktop - 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b + 3706ccb050c13a04511f8531339fca437ad4bc2a - + https://github.com/dotnet/windowsdesktop - 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b + 3706ccb050c13a04511f8531339fca437ad4bc2a - + https://github.com/dotnet/windowsdesktop - 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b + 3706ccb050c13a04511f8531339fca437ad4bc2a - + https://github.com/dotnet/wpf - ef7880b7a27805df56394c365c7b114847f9dd49 + 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 392c8f9db24e..0a14e6643ad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20424.1 - 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20424.1 From 45d37c6635f374dbfaeb6cdf22ba06d06df352df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 07:35:19 -0700 Subject: [PATCH 080/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13069) * Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.4 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20423.5 -> To Version 5.0.0-rc.1.20423.4 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.6 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20423.4 -> To Version 5.0.0-rc.1.20423.6 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200823.8 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20423.5 -> To Version 5.0.0-rc.1.20423.8 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200824.2 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20423.5 -> To Version 5.0.0-rc.1.20424.2 * Update dependencies from https://github.com/dotnet/aspnetcore build 20200824.3 Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20423.5 -> To Version 5.0.0-rc.1.20424.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5b0b2ba97dc..2660c9d9f608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 - + https://github.com/dotnet/aspnetcore - a59639714eda52c08b7cb0326af7e2a9cffde623 + 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 0a14e6643ad1..e80ca05aaa43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 - 5.0.0-rc.1.20423.5 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.3 From 2820d516561f04fcfce43fd9752aa7ac364dab9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 16:30:33 +0000 Subject: [PATCH 081/214] Update dependencies from https://github.com/dotnet/templating build 20200824.2 (#13073) [release/5.0.1xx] Update dependencies from dotnet/templating - Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20421.3 to 5.0.0-rc.1.20424.2 - Microsoft.TemplateEngine.Cli: from 5.0.0-rc.1.20421.3 to 5.0.0-rc.1.20424.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2660c9d9f608..366ba1124c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 8964302e878d00a0161df0ce1c42c535316e339d + 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/templating - 8964302e878d00a0161df0ce1c42c535316e339d + 33ab866736b99a365bc18640ebab4e6be75d69bf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e80ca05aaa43..2785ff7c4dc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 5.0.0-rc.1.20421.3 + 5.0.0-rc.1.20424.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 1df1eafb50a190e14b8d0efd761e394f391fde6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 17:47:29 +0000 Subject: [PATCH 082/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200824.4 (#13075) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - dotnet-watch: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - dotnet-user-secrets: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - dotnet-dev-certs: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 366ba1124c75..44af191ed19d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/dotnet/aspnetcore - 04ca38bcfb76902ca3617d47bd4a87559e87e7c0 + faf1d80af1b0521ed120f767efd630999200a02e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2785ff7c4dc6..c7a4bfd1f4f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 - 5.0.0-rc.1.20424.3 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 From 9ed5504db6113ae88fd171980122bd62d34fa005 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 22:25:03 +0000 Subject: [PATCH 083/214] Update dependencies from https://github.com/dotnet/runtime build 20200824.4 (#13082) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - System.Resources.Extensions: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44af191ed19d..3baa8ae971a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e56c9e47031302a164912b0eb9f0c94c9d307290 - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index c7a4bfd1f4f9..770deb22ab9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20423.8 - 5.0.0-rc.1.20423.8 - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20423.8 - 5.0.0-rc.1.20423.8 - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20423.8 - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 From dd87554ca31f7b821986d9cd772d6f6beca81af2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 23:32:52 +0000 Subject: [PATCH 084/214] Update dependencies from https://github.com/mono/linker build 20200824.4 (#13084) [release/5.0.1xx] Update dependencies from mono/linker - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20420.3 to 5.0.0-rc.1.20424.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3baa8ae971a9..03ff21d620b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ https://github.com/microsoft/vstest f5e870bd4f3402c9e6e71679f8d0b716653143f5 - + https://github.com/mono/linker - e56c9e47031302a164912b0eb9f0c94c9d307290 + e92f1e6b482518c778e14c21f55e7c621bf2d1a6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 770deb22ab9d..36508866b787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ - 5.0.0-rc.1.20420.3 + 5.0.0-rc.1.20424.4 From ec616dacaa116c229437da31658408e7aec183c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 01:24:16 +0000 Subject: [PATCH 085/214] [release/5.0.1xx] Update dependencies from dotnet/msbuild (#13078) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20417-01 to 16.8.0-preview-20424-07 - Microsoft.Build: from 16.8.0-preview-20417-01 to 16.8.0-preview-20424-07 - Disabling static graph tests --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- ...nThatWeWantToBuildAnAppWithoutTransitiveProjectRefs.cs | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03ff21d620b4..2c35bcb92720 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - df645299a158c787f9884fca2bcd8c295318193f + 79ab985eb5b6552d96d237d4179237b4b850ca64 - + https://github.com/dotnet/msbuild - df645299a158c787f9884fca2bcd8c295318193f + 79ab985eb5b6552d96d237d4179237b4b850ca64 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 36508866b787..062ab69ca4f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20417-01 + 16.8.0-preview-20424-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20417-01 + 16.8.0-preview-20424-07 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithoutTransitiveProjectRefs.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithoutTransitiveProjectRefs.cs index 4bb9d7a9c566..6d0817dbccfc 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithoutTransitiveProjectRefs.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAnAppWithoutTransitiveProjectRefs.cs @@ -29,14 +29,14 @@ public void It_builds_the_project_successfully_when_RAR_finds_all_references() { BuildAppWithTransitiveDependenciesAndTransitiveCompileReference(new []{"/p:DisableTransitiveProjectReferences=true"}); } - - [Fact] + + [Fact(Skip = "https://github.com/dotnet/sdk/issues/13081")] public void It_builds_the_project_successfully_with_static_graph_and_isolation() { BuildAppWithTransitiveDependenciesAndTransitiveCompileReference(new []{"/graph", "/isolate"}); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/13081")] public void It_cleans_the_project_successfully_with_static_graph_and_isolation() { var (testAsset, outputDirectories) = BuildAppWithTransitiveDependenciesAndTransitiveCompileReference(new []{"/graph", "/isolate"}); From 1b7348012eba2563d612cea3f423bfe305ceebde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 01:37:28 +0000 Subject: [PATCH 086/214] Update dependencies from https://github.com/dotnet/runtime build 20200824.7 (#13088) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - System.Resources.Extensions: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c35bcb92720..042010be6175 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker e92f1e6b482518c778e14c21f55e7c621bf2d1a6 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 062ab69ca4f4..96a14e30db51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20424.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20424.7 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20424.7 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 From efb04573783e6d894a379eb17468d45196b6a30c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 02:05:15 +0000 Subject: [PATCH 087/214] Update dependencies from https://github.com/mono/linker build 20200824.5 (#13089) [release/5.0.1xx] Update dependencies from mono/linker - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 042010be6175..71bb8372d477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ https://github.com/microsoft/vstest f5e870bd4f3402c9e6e71679f8d0b716653143f5 - + https://github.com/mono/linker - e92f1e6b482518c778e14c21f55e7c621bf2d1a6 + d0e680359c03a75f2c5f624783b3351a3ae42007 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 96a14e30db51..f56f768a1a98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.5 From aca395da976dccc3c85a717f85db0aa4b69a3c2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 02:17:20 +0000 Subject: [PATCH 088/214] Update dependencies from https://github.com/NuGet/NuGet.Client build 5.8.0.6783 (#13090) [release/5.0.1xx] Update dependencies from nuget/nuget.client - Updates: - NuGet.Build.Tasks: from 5.8.0-preview.2.6776 to 5.8.0-preview.3.6783 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71bb8372d477..be3dad47d5ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -77,9 +77,9 @@ https://github.com/dotnet/aspnetcore faf1d80af1b0521ed120f767efd630999200a02e - + https://github.com/NuGet/NuGet.Client - 62e098bfb22998fa638ce1a6dff5f91276770500 + 3501ddedc274ac10d4b135856b7593a6bb8a72f1 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index f56f768a1a98..2f400aef16c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,7 +48,7 @@ - 5.8.0-preview.2.6776 + 5.8.0-preview.3.6783 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 8aaa7c4ce21e115c3accc7d3bc65148147ace68f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 03:14:02 +0000 Subject: [PATCH 089/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200824.9 (#13092) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - dotnet-watch: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - dotnet-user-secrets: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - dotnet-dev-certs: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be3dad47d5ac..b3c96563fbcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 https://github.com/NuGet/NuGet.Client @@ -121,41 +121,41 @@ https://github.com/dotnet/wpf 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 - + https://github.com/dotnet/aspnetcore - faf1d80af1b0521ed120f767efd630999200a02e + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2f400aef16c4..876915feb3ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20424.9 From 60afbc0b214530dc89025a5a78d4aabd285f5667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 04:40:02 +0000 Subject: [PATCH 090/214] Update dependencies from https://github.com/dotnet/fsharp build 20200824.2 (#13094) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20422.4 to 11.0.0-beta.20424.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3c96563fbcd..c6ddcbc72889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 79ab985eb5b6552d96d237d4179237b4b850ca64 - + https://github.com/dotnet/fsharp - b4ca4304b24cdf33e755bc0cf8795c91bcc3a5a8 + d7e1e6e900ff8e7bebcac25b1939f62e4997b401 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 876915feb3ba..ade5c79b9eee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20422.4 + 11.0.0-beta.20424.2 From a346e9b44d72eb6ec89d2fbb6a32c797aeb0067c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 13 Aug 2020 17:53:09 -0700 Subject: [PATCH 091/214] Add project reference tests for target platforms --- .../GivenThatWeWantToReferenceAProject.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs index 85629e57f912..b011e73c58ca 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs @@ -48,6 +48,17 @@ public enum ReferenceBuildResult FailsBuild } + [Theory] + [InlineData("net5.0-windows", "net5.0", true)] + [InlineData("net5.0", "net5.0-windows", false)] + [InlineData("net5.0-windows", "net5.0-windows", true)] + [InlineData("net5.0-windows", "net5.0-windows7.0", true)] + [InlineData("net5.0-windows7.0", "net5.0-windows", true)] + public void It_checks_for_valid_platform_references(string referencerTarget, string dependencyTarget, bool succeeds) + { + It_checks_for_valid_references(referencerTarget, true, dependencyTarget, true, succeeds, succeeds); + } + [Theory] [InlineData("netstandard1.2", true, "netstandard1.5", true, false, false)] [InlineData("netcoreapp1.1", true, "net45;netstandard1.5", true, true, true)] From 4d4067899318b2160366bc176f97d28502067eee Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 24 Aug 2020 16:58:14 -0700 Subject: [PATCH 092/214] Remove workaround for P2P platform references #12856 --- .../targets/Microsoft.NET.Sdk.BeforeCommon.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 5463c0f3318f..08f4acbf92d5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -256,9 +256,4 @@ Copyright (c) .NET Foundation. All rights reserved. - - - $(TargetFramework) - - From 661f87fd798035a595e4f5e2c67712c44d5a5f76 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 18 Aug 2020 17:31:29 -0700 Subject: [PATCH 093/214] Add tests for ResolvePackageDependenciesDesignTime --- .../DesignTimeBuildTests.cs | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs index b2d353b960c7..6b5855a78030 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs @@ -4,6 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Xml.Linq; +using FluentAssertions; using Microsoft.NET.TestFramework; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; @@ -79,6 +80,37 @@ public void DesignTimeBuildSucceedsAfterRuntimeIdentifierIsChanged() }); } + [Theory] + [InlineData("netcoreapp3.0")] + [InlineData("net5.0")] + [InlineData("net5.0-windows")] + [InlineData("net5.0-windows7.0")] + public void DesignTimePackageDependenciesAreResolved(string targetFramework) + { + var testProject = new TestProject() + { + Name = "DesignTimePackageDependencies", + TargetFrameworks = targetFramework, + IsSdkProject = true + }; + + testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json", "12.0.2", privateAssets: "All")); + testProject.PackageReferences.Add(new TestPackageReference("Humanizer", "2.6.2")); + + var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework); + + var getValuesCommand = new GetValuesCommand(testAsset, "_PackageDependenciesDesignTime", GetValuesCommand.ValueType.Item); + getValuesCommand.DependsOnTargets = "ResolvePackageDependenciesDesignTime"; + + getValuesCommand.Execute() + .Should() + .Pass(); + + getValuesCommand.GetValues() + .Should() + .BeEquivalentTo("Newtonsoft.Json/12.0.2", "Humanizer/2.6.2"); + } + private void TestDesignTimeBuildAfterChange(Action projectChange, [CallerMemberName] string callingMethod = "") { var designTimeArgs = GetDesignTimeMSBuildArgs(); From 715f9a6e882bb5a240b1be7266a9d09858ea6478 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 24 Aug 2020 17:02:03 -0700 Subject: [PATCH 094/214] Use TargetFramework (alias) instead of TFM/TPM to look up assets file sections --- .../GivenADependencyContextBuilder.cs | 6 +- .../GivenAProjectContext.cs | 2 +- .../GivenAnAssetsFileResolver.cs | 4 +- .../CheckForTargetInAssetsFile.cs | 6 +- .../FilterResolvedFiles.cs | 4 +- .../GenerateDepsFile.cs | 4 +- .../GenerateRuntimeConfigurationFiles.cs | 5 +- .../LockFileExtensions.cs | 18 +++--- ...PreprocessPackageDependenciesDesignTime.cs | 7 ++- .../ProjectContext.cs | 7 ++- .../ResolveCopyLocalAssets.cs | 4 +- .../ResolvePackageAssets.cs | 57 +++++++------------ .../ResolvePackageDependencies.cs | 36 ++++++++++-- .../Microsoft.NET.ComposeStore.targets | 1 - .../targets/Microsoft.NET.CrossGen.targets | 1 - .../Microsoft.NET.DesignerSupport.targets | 4 +- .../targets/Microsoft.NET.Publish.targets | 6 +- .../targets/Microsoft.NET.Sdk.targets | 4 +- ...rosoft.PackageDependencyResolution.targets | 7 +-- .../DesignTimeBuildTests.cs | 2 +- 20 files changed, 96 insertions(+), 89 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs index 943ede651497..31b3bee2408c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenADependencyContextBuilder.cs @@ -56,7 +56,7 @@ public void ItBuildsDependencyContextsFromProjectLockFiles( i => true); ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetCoreApp10, + FrameworkConstants.CommonFrameworks.NetCoreApp10.GetShortFolderName(), runtime, Constants.DefaultPlatformLibrary, runtimeFrameworks: null, @@ -254,7 +254,7 @@ private DependencyContext BuildDependencyContextWithReferenceAssemblies(bool use }; ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetCoreApp10, + FrameworkConstants.CommonFrameworks.NetCoreApp10.GetShortFolderName(), runtime: null, platformLibraryName: Constants.DefaultPlatformLibrary, runtimeFrameworks: null, @@ -306,7 +306,7 @@ public void ItCanGenerateTheRuntimeFallbackGraph() new ITaskItem[] { }); ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetCoreApp10, + FrameworkConstants.CommonFrameworks.NetCoreApp10.GetShortFolderName(), runtime: null, platformLibraryName: Constants.DefaultPlatformLibrary, runtimeFrameworks: null, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProjectContext.cs index eabef7cd2bae..37d74bd8fd6f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAProjectContext.cs @@ -19,7 +19,7 @@ public void ItComputesExcludeFromPublishList() { LockFile lockFile = TestLockFiles.GetLockFile("dependencies.withgraphs"); ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetStandard16, + FrameworkConstants.CommonFrameworks.NetStandard16.GetShortFolderName(), runtime: null, Constants.DefaultPlatformLibrary, runtimeFrameworks: null, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs index 319c03d7aeeb..45be9f5886b0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAnAssetsFileResolver.cs @@ -24,7 +24,7 @@ public void ItResolvesAssembliesFromProjectLockFiles(string projectName, string { LockFile lockFile = TestLockFiles.GetLockFile(projectName); ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetCoreApp10, + FrameworkConstants.CommonFrameworks.NetCoreApp10.GetShortFolderName(), runtime, Constants.DefaultPlatformLibrary, runtimeFrameworks: null, @@ -44,7 +44,7 @@ public void ItResolvesAssembliesFromProjectLockFilesWithStoreLayout(string proje { LockFile lockFile = TestLockFiles.GetLockFile(projectName); ProjectContext projectContext = lockFile.CreateProjectContext( - FrameworkConstants.CommonFrameworks.NetCoreApp10, + FrameworkConstants.CommonFrameworks.NetCoreApp10.GetShortFolderName(), runtime, Constants.DefaultPlatformLibrary, runtimeFrameworks: null, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CheckForTargetInAssetsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CheckForTargetInAssetsFile.cs index bd3812343d8d..9ea8e9728fd3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/CheckForTargetInAssetsFile.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/CheckForTargetInAssetsFile.cs @@ -14,7 +14,7 @@ public class CheckForTargetInAssetsFile : TaskBase public string AssetsFilePath { get; set; } [Required] - public string TargetFrameworkMoniker { get; set; } + public string TargetFramework { get; set; } public string RuntimeIdentifier { get; set; } @@ -23,9 +23,7 @@ protected override void ExecuteCore() { LockFile lockFile = new LockFileCache(this).GetLockFile(AssetsFilePath); - var nugetFramework = NuGetUtils.ParseFrameworkName(TargetFrameworkMoniker); - - lockFile.GetTargetAndThrowIfNotFound(nugetFramework, RuntimeIdentifier); + lockFile.GetTargetAndThrowIfNotFound(TargetFramework, RuntimeIdentifier); } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs index a0d670cabd25..8faf44755651 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs @@ -30,8 +30,6 @@ public class FilterResolvedFiles : TaskBase [Required] public string TargetFramework { get; set; } - public string TargetPlatformMoniker { get; set; } - public string RuntimeIdentifier { get; set; } public string PlatformLibraryName { get; set; } @@ -58,7 +56,7 @@ protected override void ExecuteCore() LockFile lockFile = lockFileCache.GetLockFile(AssetsFilePath); ProjectContext projectContext = lockFile.CreateProjectContext( - NuGetTargetFrameworkUtils.GetTargetFramework(TargetFramework, TargetPlatformMoniker), + TargetFramework, RuntimeIdentifier, PlatformLibraryName, runtimeFrameworks: null, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs index f259fd5fd97b..26915d54c304 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs @@ -32,8 +32,6 @@ public class GenerateDepsFile : TaskBase [Required] public string TargetFramework { get; set; } - public string TargetPlatformMoniker { get; set; } - public string RuntimeIdentifier { get; set; } public string PlatformLibraryName { get; set; } @@ -136,7 +134,7 @@ private void WriteDepsFile(string depsFilePath) { LockFile lockFile = new LockFileCache(this).GetLockFile(AssetsFilePath); projectContext = lockFile.CreateProjectContext( - NuGetTargetFrameworkUtils.GetTargetFramework(TargetFramework, TargetPlatformMoniker), + TargetFramework, RuntimeIdentifier, PlatformLibraryName, RuntimeFrameworks, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs index a85a61e0c944..89d93094332e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs @@ -23,6 +23,9 @@ public class GenerateRuntimeConfigurationFiles : TaskBase { public string AssetsFilePath { get; set; } + [Required] + public string TargetFramework { get; set; } + [Required] public string TargetFrameworkMoniker { get; set; } @@ -126,7 +129,7 @@ protected override void ExecuteCore() LockFile lockFile = new LockFileCache(this).GetLockFile(AssetsFilePath); ProjectContext projectContext = lockFile.CreateProjectContext( - NuGetTargetFrameworkUtils.GetTargetFramework(TargetFrameworkMoniker, TargetPlatformMoniker), + TargetFramework, RuntimeIdentifier, PlatformLibraryName, RuntimeFrameworks, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs index a95beba36800..99f7b425cb98 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs @@ -13,13 +13,13 @@ namespace Microsoft.NET.Build.Tasks { internal static class LockFileExtensions { - public static LockFileTarget GetTargetAndThrowIfNotFound(this LockFile lockFile, NuGetFramework framework, string runtime) + public static LockFileTarget GetTargetAndThrowIfNotFound(this LockFile lockFile, string frameworkAlias, string runtime) { - LockFileTarget lockFileTarget = lockFile.GetTarget(framework, runtime); + LockFileTarget lockFileTarget = lockFile.GetTarget(frameworkAlias, runtime); if (lockFileTarget == null) { - string frameworkString = framework.DotNetFrameworkName; + string frameworkString = frameworkAlias; string targetMoniker = string.IsNullOrEmpty(runtime) ? frameworkString : $"{frameworkString}/{runtime}"; @@ -27,11 +27,11 @@ public static LockFileTarget GetTargetAndThrowIfNotFound(this LockFile lockFile, string message; if (string.IsNullOrEmpty(runtime)) { - message = string.Format(Strings.AssetsFileMissingTarget, lockFile.Path, targetMoniker, framework.GetShortFolderName()); + message = string.Format(Strings.AssetsFileMissingTarget, lockFile.Path, targetMoniker, frameworkString); } else { - message = string.Format(Strings.AssetsFileMissingRuntimeIdentifier, lockFile.Path, targetMoniker, framework.GetShortFolderName(), runtime); + message = string.Format(Strings.AssetsFileMissingRuntimeIdentifier, lockFile.Path, targetMoniker, frameworkString, runtime); } throw new BuildErrorException(message); @@ -42,7 +42,7 @@ public static LockFileTarget GetTargetAndThrowIfNotFound(this LockFile lockFile, public static ProjectContext CreateProjectContext( this LockFile lockFile, - NuGetFramework framework, + string frameworkAlias, string runtime, // Trimmed from publish output, and if there are no runtimeFrameworks, written to runtimeconfig.json string platformLibraryName, @@ -54,12 +54,12 @@ public static ProjectContext CreateProjectContext( { throw new ArgumentNullException(nameof(lockFile)); } - if (framework == null) + if (frameworkAlias == null) { - throw new ArgumentNullException(nameof(framework)); + throw new ArgumentNullException(nameof(frameworkAlias)); } - var lockFileTarget = lockFile.GetTargetAndThrowIfNotFound(framework, runtime); + var lockFileTarget = lockFile.GetTargetAndThrowIfNotFound(frameworkAlias, runtime); LockFileTargetLibrary platformLibrary = lockFileTarget.GetLibrary(platformLibraryName); bool isFrameworkDependent = IsFrameworkDependent(runtimeFrameworks, isSelfContained, lockFileTarget.RuntimeIdentifier, platformLibrary != null); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs index bacde6eb4335..10f763fbdb7b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PreprocessPackageDependenciesDesignTime.cs @@ -50,11 +50,12 @@ public class PreprocessPackageDependenciesDesignTime : TaskBase public string DefaultImplicitPackages { get; set; } /// - /// Eg: ".NETCoreApp,Version=v5.0". + /// The TargetFramework, which may be an alias + /// Eg: "netcoreapp3.1", "net5.0-windows", etc. /// Only packages targeting this framework will be returned. /// [Required] - public string TargetFrameworkMoniker { get; set; } + public string TargetFramework { get; set; } [Output] public ITaskItem[] PackageDependenciesDesignTime { get; private set; } @@ -82,7 +83,7 @@ protected override void ExecuteCore() var target = dependency.GetMetadata(MetadataKeys.ParentTarget); - if (!StringComparer.OrdinalIgnoreCase.Equals(target, TargetFrameworkMoniker)) + if (!StringComparer.OrdinalIgnoreCase.Equals(target, TargetFramework)) { // skip dependencies for other targets continue; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index a53bc4fa29d0..9f3f6341fdf2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -79,7 +79,12 @@ public ProjectContext(LockFile lockFile, LockFileTarget lockFileTarget, } else { - CompilationLockFileTarget = lockFile.GetTargetAndThrowIfNotFound(lockFileTarget.TargetFramework, null); + var frameworkAlias = lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.FrameworkName == lockFileTarget.TargetFramework).TargetAlias; + if (frameworkAlias == null) + { + throw new ArgumentException("Could not find TargetFramework alias in lock file for " + lockFileTarget.TargetFramework); + } + CompilationLockFileTarget = lockFile.GetTargetAndThrowIfNotFound(frameworkAlias, null); } PlatformLibrary = platformLibrary; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveCopyLocalAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveCopyLocalAssets.cs index 10d99b646513..dbefcc815dbc 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveCopyLocalAssets.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveCopyLocalAssets.cs @@ -23,8 +23,6 @@ public class ResolveCopyLocalAssets : TaskBase [Required] public string TargetFramework { get; set; } - public string TargetPlatformMoniker { get; set; } - public string RuntimeIdentifier { get; set; } public string PlatformLibraryName { get; set; } @@ -60,7 +58,7 @@ protected override void ExecuteCore() } ProjectContext projectContext = lockFile.CreateProjectContext( - NuGetTargetFrameworkUtils.GetTargetFramework(TargetFramework, TargetPlatformMoniker), + TargetFramework, RuntimeIdentifier, PlatformLibraryName, RuntimeFrameworks, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs index dc98a77347b5..d65b3a470ce8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs @@ -45,15 +45,10 @@ public sealed class ResolvePackageAssets : TaskBase public string ProjectPath { get; set; } /// - /// TFM to use for compile-time assets. + /// TargetFramework to use for compile-time assets. /// [Required] - public string TargetFrameworkMoniker { get; set; } - - /// - /// TPM to use for compile-time assets. - /// - public string TargetPlatformMoniker { get; set; } + public string TargetFramework { get; set; } /// /// RID to use for runtime assets (may be empty) @@ -438,8 +433,7 @@ internal byte[] HashSettings() writer.Write(r.ItemSpec ?? ""); } } - writer.Write(TargetFrameworkMoniker); - writer.Write(TargetPlatformMoniker ?? ""); + writer.Write(TargetFramework); writer.Write(VerifyMatchingImplicitPackageVersion); } @@ -640,7 +634,7 @@ private sealed class CacheWriter : IDisposable private HashSet _copyLocalPackageExclusions; private HashSet _publishPackageExclusions; private Placeholder _metadataStringTablePosition; - private NuGetFramework _targetFramework; + private string _targetFramework; private int _itemCount; public bool CanWriteToCacheFile { get; set; } @@ -651,7 +645,7 @@ private sealed class CacheWriter : IDisposable public CacheWriter(ResolvePackageAssets task) { - _targetFramework = NuGetTargetFrameworkUtils.GetTargetFramework(task.TargetFrameworkMoniker, task.TargetPlatformMoniker); + _targetFramework = task.TargetFramework; _task = task; _lockFile = new LockFileCache(task).GetLockFile(task.ProjectAssetsFile); @@ -1092,13 +1086,25 @@ private void WriteApphostsForShimRuntimeIdentifiers() /// private bool CanResolveApphostFromFrameworkReference() { - if (_targetFramework.Version.Major >= 3 - && _targetFramework.Framework.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase)) + if (!CanWriteToCacheFile) { + // If we can't write to the cache file, it's because this is a design-time build where the + // TargetFramework doesn't match what's in the assets file. So don't try looking up the + // TargetFramework in the assets file. return false; } + else + { + var targetFramework = _lockFile.GetTarget(_targetFramework, null).TargetFramework; - return true; + if (targetFramework.Version.Major >= 3 + && targetFramework.Framework.Equals(".NETCoreApp", StringComparison.OrdinalIgnoreCase)) + { + return false; + } + + return true; + } } private void WritePackageFolders() @@ -1481,27 +1487,4 @@ private Tuple FindApphostInRuntimeTarget(string a } } } - - internal static class NuGetTargetFrameworkUtils - { - public static NuGetFramework GetTargetFramework(string targetFrameworkMoniker, string targetPlatformMoniker) - { - var targetFramework = NuGetUtils.ParseFrameworkName(targetFrameworkMoniker); - if (targetPlatformMoniker != null && !targetPlatformMoniker.Equals(string.Empty)) - { - try - { - var targetPlatform = NuGetUtils.ParseFrameworkName(targetPlatformMoniker); - var constructedFramework = new NuGetFramework(targetFramework.Framework, targetFramework.Version, targetPlatform.Framework, targetPlatform.Version); - - return constructedFramework; - } - catch - { - return targetFramework; - } - } - return targetFramework; - } - } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index 0238f434bf9d..3dd50c488946 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -142,11 +142,28 @@ internal ResolvePackageDependencies(LockFile lockFile, IPackageResolver packageR private LockFile LockFile => _lockFile ??= new LockFileCache(this).GetLockFile(ProjectAssetsFile); + private Dictionary _targetNameToAliasMap; + /// /// Raise Nuget LockFile representation to MSBuild items /// protected override void ExecuteCore() { + var targetFrameworkToAliasMap = LockFile.PackageSpec.TargetFrameworks.ToDictionary(tf => tf.FrameworkName.DotNetFrameworkName, tf => tf.TargetAlias); + + _targetNameToAliasMap = LockFile.Targets.ToDictionary(t => t.Name, t => + { + var alias = targetFrameworkToAliasMap[t.TargetFramework.DotNetFrameworkName]; + if (string.IsNullOrEmpty(t.RuntimeIdentifier)) + { + return alias; + } + else + { + return alias + "/" + t.RuntimeIdentifier; + } + }); + ReadProjectFileDependencies(); RaiseLockFileTargets(); GetPackageAndFileDefinitions(); @@ -211,8 +228,10 @@ private void GetPackageAndFileDefinitions() foreach (var target in parentTargets) { + string frameworkAlias = _targetNameToAliasMap[target.Name]; + var fileDepsItem = new TaskItem(fileKey); - fileDepsItem.SetMetadata(MetadataKeys.ParentTarget, target.Name); // Foreign Key + fileDepsItem.SetMetadata(MetadataKeys.ParentTarget, frameworkAlias); // Foreign Key fileDepsItem.SetMetadata(MetadataKeys.ParentPackage, packageId); // Foreign Key _fileDependencies.Add(fileDepsItem); @@ -286,8 +305,15 @@ private void GetPackageAndFileDependencies(LockFileTarget target) if (_projectFileDependencies.Contains(package.Name)) { + if (!_targetNameToAliasMap.ContainsKey(target.Name)) + { + + } + + string frameworkAlias = _targetNameToAliasMap[target.Name]; + TaskItem item = new TaskItem(packageId); - item.SetMetadata(MetadataKeys.ParentTarget, target.Name); // Foreign Key + item.SetMetadata(MetadataKeys.ParentTarget, frameworkAlias); // Foreign Key item.SetMetadata(MetadataKeys.ParentPackage, string.Empty); // Foreign Key _packageDependencies.Add(item); @@ -311,6 +337,7 @@ private void GetPackageDependencies( HashSet transitiveProjectRefs) { string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}"; + string frameworkAlias = _targetNameToAliasMap[targetName]; foreach (var deps in package.Dependencies) { if (!resolvedPackageVersions.TryGetValue(deps.Id, out string version)) @@ -321,7 +348,7 @@ private void GetPackageDependencies( string depsName = $"{deps.Id}/{version}"; TaskItem item = new TaskItem(depsName); - item.SetMetadata(MetadataKeys.ParentTarget, targetName); // Foreign Key + item.SetMetadata(MetadataKeys.ParentTarget, frameworkAlias); // Foreign Key item.SetMetadata(MetadataKeys.ParentPackage, packageId); // Foreign Key if (transitiveProjectRefs.Contains(deps.Id)) @@ -336,6 +363,7 @@ private void GetPackageDependencies( private void GetFileDependencies(LockFileTargetLibrary package, string targetName) { string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}"; + string frameworkAlias = _targetNameToAliasMap[targetName]; // for each type of file group foreach (var fileGroup in (FileGroup[])Enum.GetValues(typeof(FileGroup))) @@ -354,7 +382,7 @@ private void GetFileDependencies(LockFileTargetLibrary package, string targetNam var fileKey = $"{packageId}/{filePath}"; var item = new TaskItem(fileKey); item.SetMetadata(MetadataKeys.FileGroup, fileGroup.ToString()); - item.SetMetadata(MetadataKeys.ParentTarget, targetName); // Foreign Key + item.SetMetadata(MetadataKeys.ParentTarget, frameworkAlias); // Foreign Key item.SetMetadata(MetadataKeys.ParentPackage, packageId); // Foreign Key if (fileGroup == FileGroup.FrameworkAssembly) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets index 27c56563810d..1dd71338174c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets @@ -421,7 +421,6 @@ Copyright (c) .NET Foundation. All rights reserved. ResolvedFiles ="@(_ResolvedCopyLocalPublishAssets)" PackagesToPrune="$(PackagesToPrune)" TargetFramework="$(TargetFrameworkMoniker)" - TargetPlatformMoniker="$(TargetPlatformMoniker)" RuntimeIdentifier="$(RuntimeIdentifier)" IsSelfContained="$(SelfContained)" > diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets index f2553e2f6d2e..fdc73e3e8943 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.CrossGen.targets @@ -279,7 +279,6 @@ Copyright (c) .NET Foundation. All rights reserved. @@ -104,6 +103,7 @@ Copyright (c) .NET Foundation. All rights reserved. PlatformLibraryName="$(MicrosoftNETPlatformLibrary)" RuntimeConfigPath="$(_DesignerRuntimeConfigFilePath)" RuntimeFrameworks="@(RuntimeFramework)" + TargetFramework="$(TargetFramework)" TargetFrameworkMoniker="$(TargetFrameworkMoniker)" TargetPlatformMoniker="$(TargetPlatformMoniker)" UserRuntimeConfig="$(UserRuntimeConfig)" diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index 1546f9b08255..8c266b06c155 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -609,8 +609,7 @@ Copyright (c) .NET Foundation. All rights reserved. @@ -244,8 +244,7 @@ Copyright (c) .NET Foundation. All rights reserved. ProjectPath="$(MSBuildProjectFullPath)" ProjectLanguage="$(Language)" EmitAssetsLogMessages="$(EmitAssetsLogMessages)" - TargetFrameworkMoniker="$(NuGetTargetMoniker)" - TargetPlatformMoniker="$(TargetPlatformMoniker)" + TargetFramework="$(TargetFramework)" RuntimeIdentifier="$(RuntimeIdentifier)" PlatformLibraryName="$(MicrosoftNETPlatformLibrary)" RuntimeFrameworks="@(RuntimeFramework)" @@ -314,7 +313,7 @@ Copyright (c) .NET Foundation. All rights reserved. PackageDefinitions="@(PackageDefinitions)" PackageDependencies="@(PackageDependencies)" DefaultImplicitPackages="$(DefaultImplicitPackages)" - TargetFrameworkMoniker="$(NuGetTargetMoniker)"> + TargetFramework="$(TargetFramework)"> diff --git a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs index 6b5855a78030..263455439cb6 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/DesignTimeBuildTests.cs @@ -135,7 +135,7 @@ private void TestDesignTimeBuildAfterChange(Action projectChange, [Ca // Use a test-specific packages folder testProject.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\packages"; - var testAsset = _testAssetsManager.CreateTestProject(testProject) + var testAsset = _testAssetsManager.CreateTestProject(testProject, callingMethod: callingMethod) .WithProjectChanges(p => { var ns = p.Root.Name.Namespace; From f8d5e8a75cbc8fce2df150ee9ce037d846144cf6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 24 Aug 2020 17:02:20 -0700 Subject: [PATCH 095/214] Update design-time package tests --- ...WantToGetDependenciesViaDesignTimeBuild.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs index c454cf4a50b4..84e2088d439a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeWantToGetDependenciesViaDesignTimeBuild.cs @@ -14,7 +14,7 @@ public void ItShouldNotReturnPackagesWithUnknownTypes() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = string.Empty, PackageDefinitions = new ITaskItem[] { @@ -44,13 +44,13 @@ public void ItShouldNotReturnPackagesWithUnknownTypes() itemSpec: "mockPackageNoType/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageUnknown/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }) } }; @@ -65,7 +65,7 @@ public void ItShouldReturnUnresolvedPackageDependenciesWithTypePackage() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = string.Empty, PackageDefinitions = new ITaskItem[] { @@ -87,7 +87,7 @@ public void ItShouldReturnUnresolvedPackageDependenciesWithTypePackage() itemSpec: "mockPackageUnresolved/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }) } }; @@ -111,7 +111,7 @@ public void ItShouldIdentifyDefaultImplicitPackages() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = "DefaultImplicit", PackageDefinitions = new ITaskItem[] { @@ -132,7 +132,7 @@ public void ItShouldIdentifyDefaultImplicitPackages() itemSpec: "DefaultImplicit/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }) } }; @@ -150,7 +150,7 @@ public void ItShouldIgnoreAllDependenciesWithTypeNotEqualToPackageOrUnresolved() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = string.Empty, PackageDefinitions = new ITaskItem[] { new MockTaskItem( @@ -239,49 +239,49 @@ public void ItShouldIgnoreAllDependenciesWithTypeNotEqualToPackageOrUnresolved() itemSpec: "mockPackageExternalProject/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageProject/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageContent/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageAssembly/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageFrameworkAssembly/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageDiagnostic/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageWinmd/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "mockPackageReference/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }) } }; @@ -296,7 +296,7 @@ public void ItShouldOnlyReturnPackagesInTheSpecifiedTarget() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = string.Empty, PackageDefinitions = new ITaskItem[] { new MockTaskItem( @@ -325,13 +325,13 @@ public void ItShouldOnlyReturnPackagesInTheSpecifiedTarget() itemSpec: "Package1/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "Package2/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.6" } + { MetadataKeys.ParentTarget, "net46" } }) } }; @@ -348,7 +348,7 @@ public void ItShouldOnlyReturnTopLevelPackages() { var task = new PreprocessPackageDependenciesDesignTime { - TargetFrameworkMoniker = ".Net Framework,Version=v4.5", + TargetFramework = "net45", DefaultImplicitPackages = string.Empty, PackageDefinitions = new ITaskItem[] { new MockTaskItem( @@ -377,13 +377,13 @@ public void ItShouldOnlyReturnTopLevelPackages() itemSpec: "Package1/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" } + { MetadataKeys.ParentTarget, "net45" } }), new MockTaskItem( itemSpec: "ChildPackage1/1.0.0", metadata: new Dictionary { - { MetadataKeys.ParentTarget, ".Net Framework,Version=v4.5" }, + { MetadataKeys.ParentTarget, "net45" }, { MetadataKeys.ParentPackage, "Package1/1.0.0" } }) } From 280e790ebac8d86dd27bf373da7e0245e340d936 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 25 Aug 2020 12:41:28 -0700 Subject: [PATCH 096/214] Add CPD strict dependencies for dotnet/installer (#13108) --- eng/Version.Details.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6ddcbc72889..7bdd76d529a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,6 +121,14 @@ https://github.com/dotnet/wpf 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 + + https://github.com/dotnet/wpf + 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 + + + https://github.com/dotnet/winforms + 7ad393f0e830d91b1c4ebc77500c23acb82d10bb + https://github.com/dotnet/aspnetcore f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 @@ -157,6 +165,10 @@ https://github.com/dotnet/aspnetcore f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + + https://github.com/dotnet/aspnetcore + f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 From 593c9cb7b06dad7660332a8666a886206fbb6170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 22:56:11 +0000 Subject: [PATCH 097/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13096) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - System.Resources.Extensions: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 - Removing project to project reference work around - Disabling p2p reference tests for full framework --- eng/Version.Details.xml | 48 +++++++++---------- eng/Versions.props | 20 ++++---- .../Microsoft.NET.Sdk.BeforeCommon.targets | 5 -- ...ntToBuildAP2PrefernceWithTargetPlatform.cs | 2 +- .../GiventThatWeWantDesignerSupport.cs | 2 +- 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bdd76d529a8..4a1a50549ffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index ade5c79b9eee..0d18809f3cb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20424.7 - 5.0.0-rc.1.20424.7 - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20424.7 - 5.0.0-rc.1.20424.7 - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20424.7 - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 5463c0f3318f..08f4acbf92d5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -256,9 +256,4 @@ Copyright (c) .NET Foundation. All rights reserved. - - - $(TargetFramework) - - diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs index a45e406ed2e4..f429af8a7c61 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs @@ -17,7 +17,7 @@ public GivenThatWeWantToBuildAP2PReferenceWithTargetPlatform(ITestOutputHelper l { } - [Fact] + [CoreMSBuildOnlyFact] public void It_builds_successfully() { var appProject = new TestProject() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs b/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs index eebd6670e9b7..1d18b675cbd4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs @@ -30,7 +30,7 @@ public GivenThatWeWantDesignerSupport(ITestOutputHelper log) : base(log) [InlineData("net5.0-windows")] public void It_provides_runtime_configuration_and_shadow_copy_files_via_outputgroup(string targetFramework) { - if (targetFramework == "net5.0-windows" && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (targetFramework == "net5.0-windows" && (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)) { // net5.0-windows is windows only scenario return; From 0b9f5c3402583fd1b84b393af137f43dda818cd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 02:13:36 +0000 Subject: [PATCH 098/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13098) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1a50549ffc..5a058c0cfa15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,21 +105,21 @@ https://github.com/dotnet/runtime f4e99f4afa445b519abcd7c5c87cbf54771614db - + https://github.com/dotnet/windowsdesktop - 3706ccb050c13a04511f8531339fca437ad4bc2a + 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + https://github.com/dotnet/windowsdesktop - 3706ccb050c13a04511f8531339fca437ad4bc2a + 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + https://github.com/dotnet/windowsdesktop - 3706ccb050c13a04511f8531339fca437ad4bc2a + 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + https://github.com/dotnet/wpf - 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 + ff75d520118fa519b558166af462652637649e74 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 0d18809f3cb2..5baabbae8aa8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20424.1 + 5.0.0-rc.1.20425.2 - 5.0.0-rc.1.20424.1 + 5.0.0-rc.1.20425.5 From 44f04829c005f0d58af3e56a7b2f0cf08f9f1c74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 03:47:35 +0000 Subject: [PATCH 099/214] Update dependencies from https://github.com/dotnet/msbuild build 20200825.3 (#13109) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20424-07 to 16.8.0-preview-20425-03 - Microsoft.Build: from 16.8.0-preview-20424-07 to 16.8.0-preview-20425-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a058c0cfa15..49c935c109d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 79ab985eb5b6552d96d237d4179237b4b850ca64 + 384d02a5f26cb58fdd3e62b72505e318e124657c - + https://github.com/dotnet/msbuild - 79ab985eb5b6552d96d237d4179237b4b850ca64 + 384d02a5f26cb58fdd3e62b72505e318e124657c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5baabbae8aa8..d8d2336bc6b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20424-07 + 16.8.0-preview-20425-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20424-07 + 16.8.0-preview-20425-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From a886f05f2e39b1fc167a4123ade711671aecb055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 05:22:59 +0000 Subject: [PATCH 100/214] Update dependencies from https://github.com/microsoft/vstest build 20200825-03 (#13106) [release/5.0.1xx] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200821-04 to 16.8.0-release-20200825-03 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49c935c109d1..48363d4723c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ https://github.com/NuGet/NuGet.Client 3501ddedc274ac10d4b135856b7593a6bb8a72f1 - + https://github.com/microsoft/vstest - f5e870bd4f3402c9e6e71679f8d0b716653143f5 + c1a6782a8158fc73ccc116eeee1ab6ccce0a620b https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index d8d2336bc6b6..bea91d522fa5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ - 16.8.0-release-20200821-04 + 16.8.0-release-20200825-03 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From f940f0c73d9f1ed22d31e22b77b27192f6598c88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 05:42:38 +0000 Subject: [PATCH 101/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13113) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - System.Resources.Extensions: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 - Coherency Updates: - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48363d4723c8..cb3cc5ed238d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d https://github.com/dotnet/windowsdesktop @@ -121,13 +121,13 @@ https://github.com/dotnet/wpf ff75d520118fa519b558166af462652637649e74 - + https://github.com/dotnet/wpf - 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 + ff75d520118fa519b558166af462652637649e74 - + https://github.com/dotnet/winforms - 7ad393f0e830d91b1c4ebc77500c23acb82d10bb + dd4936c5edb30c78349038737bedcce2539851a2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bea91d522fa5..1b75c4e6d23d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.13 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20425.1 - 5.0.0-rc.1.20425.1 - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20425.1 - 5.0.0-rc.1.20425.1 - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20425.1 - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.13 From f251132954e95602711f21707d5315d658deb65e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 26 Aug 2020 00:26:45 -0700 Subject: [PATCH 102/214] Apply code review suggestion Co-authored-by: Nikolche Kolev --- src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index 9f3f6341fdf2..5ad5b4cf46de 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -79,7 +79,7 @@ public ProjectContext(LockFile lockFile, LockFileTarget lockFileTarget, } else { - var frameworkAlias = lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.FrameworkName == lockFileTarget.TargetFramework).TargetAlias; + var frameworkAlias = lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.FrameworkName == lockFileTarget.TargetFramework)?.TargetAlias; if (frameworkAlias == null) { throw new ArgumentException("Could not find TargetFramework alias in lock file for " + lockFileTarget.TargetFramework); From 72744d5c30557148ec08c982f901a9c345e8c8c7 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 26 Aug 2020 00:27:59 -0700 Subject: [PATCH 103/214] Apply code review suggestions and fix dotnet store --- .../GenerateRuntimeConfigurationFiles.cs | 2 -- .../Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs | 5 ----- .../targets/Microsoft.NET.ComposeStore.targets | 2 +- .../targets/Microsoft.NET.DesignerSupport.targets | 1 - .../targets/Microsoft.NET.Sdk.targets | 1 - 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs index 89d93094332e..11f12fd44aef 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRuntimeConfigurationFiles.cs @@ -29,8 +29,6 @@ public class GenerateRuntimeConfigurationFiles : TaskBase [Required] public string TargetFrameworkMoniker { get; set; } - public string TargetPlatformMoniker { get; set; } - [Required] public string RuntimeConfigPath { get; set; } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs index 3dd50c488946..6cb69accda28 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs @@ -305,11 +305,6 @@ private void GetPackageAndFileDependencies(LockFileTarget target) if (_projectFileDependencies.Contains(package.Name)) { - if (!_targetNameToAliasMap.ContainsKey(target.Name)) - { - - } - string frameworkAlias = _targetNameToAliasMap[target.Name]; TaskItem item = new TaskItem(packageId); diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets index 1dd71338174c..bca1187fe9bb 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ComposeStore.targets @@ -420,7 +420,7 @@ Copyright (c) .NET Foundation. All rights reserved. diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DesignerSupport.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DesignerSupport.targets index 18a30c94310a..91422e67aec7 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DesignerSupport.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DesignerSupport.targets @@ -105,7 +105,6 @@ Copyright (c) .NET Foundation. All rights reserved. RuntimeFrameworks="@(RuntimeFramework)" TargetFramework="$(TargetFramework)" TargetFrameworkMoniker="$(TargetFrameworkMoniker)" - TargetPlatformMoniker="$(TargetPlatformMoniker)" UserRuntimeConfig="$(UserRuntimeConfig)" WriteAdditionalProbingPathsToMainConfig="true" /> diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 98a953d41b84..eca1518e417f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -290,7 +290,6 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Wed, 26 Aug 2020 07:56:01 +0000 Subject: [PATCH 104/214] Update dependencies from https://github.com/dotnet/runtime build 20200825.16 (#13119) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - System.Resources.Extensions: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb3cc5ed238d..7fcc2ccbff87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 1b75c4e6d23d..f512051fa428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20425.13 - 5.0.0-rc.1.20425.13 - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20425.13 - 5.0.0-rc.1.20425.13 - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20425.13 - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 From 041605d9ca356b8fdabf35bc3b69b92747a89ae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 07:50:46 -0700 Subject: [PATCH 105/214] Update dependencies from https://github.com/dotnet/runtime build 20200825.18 (#13120) System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Resources.Extensions , System.Security.Cryptography.ProtectedData From Version 5.0.0-rc.1.20425.16 -> To Version 5.0.0-rc.1.20425.18 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7fcc2ccbff87..a61afc6fd97e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c https://github.com/dotnet/arcade 56a95cc477558c1ccdf16d7abe962849ea970ba4 - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index f512051fa428..944c4a27ac72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20419.21 3.1.0 - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20425.16 - 5.0.0-rc.1.20425.16 - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20425.16 - 5.0.0-rc.1.20425.16 - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20425.16 - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 From 4c6c7338fb543bd4a80f2577d18f6e461ed557f6 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Mon, 24 Aug 2020 14:52:17 -0700 Subject: [PATCH 106/214] Rename SdkSupportedTargetPlatform, add SupportedTargetPlatform --- .../Microsoft.NET.Sdk.BeforeCommon.targets | 5 +++-- .../targets/Microsoft.NET.Sdk.props | 5 ++++- .../Microsoft.NET.SupportedPlatforms.props | 22 +++++++++++++++++++ ...osoft.NET.TargetFrameworkInference.targets | 6 ++--- ....WindowsSdkSupportedTargetPlatforms.props} | 16 +++++++------- .../GivenThatWeWantToBuildALibrary.cs | 8 +++---- 6 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.SupportedPlatforms.props rename src/Tasks/Microsoft.NET.Build.Tasks/targets/{Microsoft.NET.WindowsSupportedTargetPlatforms.props => Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props} (50%) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets index 5463c0f3318f..f4688caef384 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets @@ -16,7 +16,8 @@ Copyright (c) .NET Foundation. All rights reserved. - + + @@ -214,7 +215,7 @@ Copyright (c) .NET Foundation. All rights reserved. - <_SupportedPlatformCompatibleVersions Include="@(SupportedTargetPlatform)" Condition=" %(Identity) != '' and $([MSBuild]::VersionLessThan(%(Identity), $(TargetPlatformVersion))) " /> + <_SupportedPlatformCompatibleVersions Include="@(SdkSupportedTargetPlatform)" Condition=" %(Identity) != '' and $([MSBuild]::VersionLessThan(%(Identity), $(TargetPlatformVersion))) " /> <_ImplicitDefineConstant Include="@(_SupportedPlatformCompatibleVersions->'$(TargetPlatformIdentifier.ToUpper())%(Identity)'->Replace('.', '_'))" /> diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props index c4617ce72a36..2c57a1e65404 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props @@ -119,9 +119,12 @@ Copyright (c) .NET Foundation. All rights reserved. + + + - + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.SupportedPlatforms.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.SupportedPlatforms.props new file mode 100644 index 000000000000..e78da5619f0e --- /dev/null +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.SupportedPlatforms.props @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index f3c418466fde..8d9a085d37ca 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -202,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved. BeforeTargets="ProcessFrameworkReferences" Condition="'$(TargetPlatformVersion)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))"> - <_ValidTargetPlatformVersion Include="@(SupportedTargetPlatform)" Condition="'@(SupportedTargetPlatform)' != '' and $([MSBuild]::VersionEquals(%(Identity), $(TargetPlatformVersion)))" /> + <_ValidTargetPlatformVersion Include="@(SdkSupportedTargetPlatform)" Condition="'@(SdkSupportedTargetPlatform)' != '' and $([MSBuild]::VersionEquals(%(Identity), $(TargetPlatformVersion)))" /> @@ -216,8 +216,8 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="'$(TargetPlatformVersion)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0))"> true - <_ValidTargetPlatformVersions Condition="'@(SupportedTargetPlatform)' != ''" >@(SupportedTargetPlatform, '%0a') - <_ValidTargetPlatformVersions Condition="'@(SupportedTargetPlatform)' == ''" >None + <_ValidTargetPlatformVersions Condition="'@(SdkSupportedTargetPlatform)' != ''" >@(SdkSupportedTargetPlatform, '%0a') + <_ValidTargetPlatformVersions Condition="'@(SdkSupportedTargetPlatform)' == ''" >None - + - - - - - + + + + + - + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 92dcdf853750..0a63fa9c611f 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -454,8 +454,8 @@ public void It_implicitly_defines_compilation_constants_for_the_target_platform( [Theory] [InlineData(new[] { "1.0", "1.1" }, "ios", "1.1", new[] { "IOS", "IOS1_1", "IOS1_0" })] [InlineData(new[] { "11.11", "12.12", "13.13" }, "android", "12.12", new[] { "ANDROID", "ANDROID11_11", "ANDROID12_12" })] - [InlineData(new string[] { /* Use the built in SupportedTargetPlatform items */}, "windows", "10.0.19041", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763", "WINDOWS10_0_18362", "WINDOWS10_0_19041" })] - public void It_implicitly_defines_compilation_constants_for_the_target_platform_with_backwards_compatibility(string[] supportedTargetPlatform, string targetPlatformIdentifier, string targetPlatformVersion, string[] expectedDefines) + [InlineData(new string[] { /* Use the built in SdkSupportedTargetPlatform items */}, "windows", "10.0.19041", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763", "WINDOWS10_0_18362", "WINDOWS10_0_19041" })] + public void It_implicitly_defines_compilation_constants_for_the_target_platform_with_backwards_compatibility(string[] sdkSupportedTargetPlatform, string targetPlatformIdentifier, string targetPlatformVersion, string[] expectedDefines) { var targetFramework = "net5.0"; var testAsset = _testAssetsManager @@ -480,9 +480,9 @@ public void It_implicitly_defines_compilation_constants_for_the_target_platform_ var itemGroup = new XElement(ns + "ItemGroup"); project.Root.Add(itemGroup); - foreach (var targetPlatform in supportedTargetPlatform) + foreach (var targetPlatform in sdkSupportedTargetPlatform) { - itemGroup.Add(new XElement(ns + "SupportedTargetPlatform", new XAttribute("Include", targetPlatform))); + itemGroup.Add(new XElement(ns + "SdkSupportedTargetPlatform", new XAttribute("Include", targetPlatform))); } }); From 26855b5739422694549adf47ea442454c41da01b Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 26 Aug 2020 10:37:20 -0700 Subject: [PATCH 107/214] Adding default ProduceReferenceAssembly value for F# (#13085) * Adding default ProduceReferenceAssembly value for f# * Disabling f# test on full framework --- .../targets/Microsoft.NET.Sdk.FSharp.props | 4 ++++ ...ivenThatWeWantToBuildADesktopExeWithFSharp.cs | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.props index 1f603b2a18c6..4412b6594487 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FSharp.props @@ -28,4 +28,8 @@ Copyright (c) .NET Foundation. All rights reserved. + + false + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs index 3b46693ac0e3..970d67bb4edc 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs @@ -57,5 +57,21 @@ public void It_builds_a_simple_desktop_app() "System.ValueTuple.dll", }); } + + // https://github.com/dotnet/sdk/issues/12560 + [CoreMSBuildAndWindowsOnlyFact] + public void It_builds_a_simple_net50_app() + { + var testAsset = _testAssetsManager + .CopyTestAsset("HelloWorldFS") + .WithSource() + .WithTargetFramework("net5.0"); + + var buildCommand = new BuildCommand(testAsset); + buildCommand + .Execute() + .Should() + .Pass(); + } } } From deb3f9b6334644f688b73d0d91eb9abae4e258cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 13:32:14 -0700 Subject: [PATCH 108/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200825.11 (#13129) VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 , Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20424.9 -> To Version 5.0.0-rc.1.20425.11 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a61afc6fd97e..cba2913f3a54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms dd4936c5edb30c78349038737bedcce2539851a2 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 - + https://github.com/dotnet/aspnetcore - f2c3c11a2d5cc6006b2dd79b686c3057fefc1ae6 + 098be5f5ee2039ff7a184a4098802537390f2b35 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 944c4a27ac72..e2543a3be9fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 - 5.0.0-rc.1.20424.9 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20425.11 From 11d6ad5a444cb33751654110d5d0cfb1211d4a96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 13:34:15 -0700 Subject: [PATCH 109/214] Update dependencies from https://github.com/dotnet/arcade build 20200824.23 (#13134) Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20419.21 -> To Version 5.0.0-beta.20424.23 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++--- eng/Versions.props | 4 +- eng/common/build.ps1 | 2 + eng/common/build.sh | 11 +++- eng/common/cross/armel/tizen-build-rootfs.sh | 2 - eng/common/cross/armel/tizen/tizen.patch | 9 --- eng/common/performance/microbenchmarks.proj | 4 +- eng/common/performance/performance-setup.sh | 9 +-- eng/common/tools.ps1 | 16 +++-- eng/common/tools.sh | 66 +++++++++++--------- global.json | 4 +- 11 files changed, 76 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cba2913f3a54..79e3ff09abb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/runtime 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/arcade - 56a95cc477558c1ccdf16d7abe962849ea970ba4 + 229645f3ad023a4aa2717d266cef5339dc3b5162 https://github.com/dotnet/runtime @@ -179,17 +179,17 @@ - + https://github.com/dotnet/arcade - 56a95cc477558c1ccdf16d7abe962849ea970ba4 + 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/arcade - 56a95cc477558c1ccdf16d7abe962849ea970ba4 + 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/arcade - 56a95cc477558c1ccdf16d7abe962849ea970ba4 + 229645f3ad023a4aa2717d266cef5339dc3b5162 diff --git a/eng/Versions.props b/eng/Versions.props index e2543a3be9fa..180eae7101ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 1.8.0 - 5.0.0-beta.20419.21 + 5.0.0-beta.20424.23 3.1.0 5.0.0-rc.1.20425.18 4.3.0 @@ -141,7 +141,7 @@ 4.19.2 4.19.0 - 5.0.0-beta.20419.21 + 5.0.0-beta.20424.23 .exe diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 67ee6d28d3fa..94a91c0817e8 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -23,6 +23,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, [switch] $prepareMachine, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) diff --git a/eng/common/build.sh b/eng/common/build.sh index 6d7c5a1f69c2..252b63604e6e 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -76,9 +76,10 @@ projects='' configuration='Debug' prepare_machine=false verbosity='minimal' +runtime_source_feed='' +runtime_source_feed_key='' properties='' - while [[ $# > 0 ]]; do opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" case "$opt" in @@ -151,6 +152,14 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; + -runtimesourcefeed) + runtime_source_feed=$2 + shift + ;; + -runtimesourcefeedkey) + runtime_source_feed_key=$2 + shift + ;; *) properties="$properties $1" ;; diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh index 25a0efa0bdd6..9a4438af61c2 100755 --- a/eng/common/cross/armel/tizen-build-rootfs.sh +++ b/eng/common/cross/armel/tizen-build-rootfs.sh @@ -30,8 +30,6 @@ rm -rf $TIZEN_TMP_DIR # Configure Tizen rootfs echo ">>Start configuring Tizen rootfs" -rm ./usr/lib/libunwind.so -ln -s libunwind.so.8 ./usr/lib/libunwind.so ln -sfn asm-arm ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch echo "< - --corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\5.0.0\corerun.exe + --corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\6.0.0\corerun.exe - --corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/5.0.0/corerun + --corerun $(BaseDirectory)/dotnet-mono/shared/Microsoft.NETCore.App/6.0.0/corerun diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 65a9d8fc6193..b5dc8e1e7d35 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -194,17 +194,18 @@ if [[ "$internal" == true ]]; then fi fi -if [[ "$mono_dotnet" != "" ]]; then +if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot" + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoMono" fi if [[ "$wasm_runtime_loc" != "" ]]; then configurations="CompilationMode=wasm RunKind=micro" - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM" + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM NoMono" fi -if [[ "$monointerpreter" == "true" ]]; then - extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter" +if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "true" ]]; then + extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoMono" fi common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture" diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6f8bc41116b7..408a3cdee5ae 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -57,6 +57,11 @@ set-strictmode -version 2.0 $ErrorActionPreference = 'Stop' [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +# If specifies, provides an alternate path for getting .NET Core SDKs and Runtimes. This script will still try public sources first. +[string]$runtimeSourceFeed = if (Test-Path variable:runtimeSourceFeed) { $runtimeSourceFeed } else { $null } +# Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed +[string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -223,7 +228,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { } function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '') { - InstallDotNet $dotnetRoot $version $architecture + InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey } function InstallDotNet([string] $dotnetRoot, @@ -248,10 +253,8 @@ function InstallDotNet([string] $dotnetRoot, & $installScript @installParameters } catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet runtime '$runtime' from public location." - - # Only the runtime can be installed from a custom [private] location. - if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed -or $runtimeSourceFeedKey) { + Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'" if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } if ($runtimeSourceFeedKey) { @@ -264,10 +267,11 @@ function InstallDotNet([string] $dotnetRoot, & $installScript @installParameters } catch { - Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." ExitWithExitCode 1 } } else { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." ExitWithExitCode 1 } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e94fce22ec37..a0650dda17c9 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -64,6 +64,10 @@ else use_global_nuget_cache=${use_global_nuget_cache:-true} fi +# Used when restoring .NET SDK from alternative feeds +runtime_source_feed=${runtime_source_feed:-''} +runtime_source_feed_key=${runtime_source_feed_key:-''} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -170,11 +174,11 @@ function InitializeDotNetCli { function InstallDotNetSdk { local root=$1 local version=$2 - local architecture="" - if [[ $# == 3 ]]; then + local architecture="unset" + if [[ $# -ge 3 ]]; then architecture=$3 fi - InstallDotNet "$root" "$version" $architecture + InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key } function InstallDotNet { @@ -185,50 +189,50 @@ function InstallDotNet { local install_script=$_GetDotNetInstallScript local archArg='' - if [[ -n "${3:-}" ]]; then + if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then archArg="--architecture $3" fi local runtimeArg='' - if [[ -n "${4:-}" ]]; then + if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then runtimeArg="--runtime $4" fi - local skipNonVersionedFilesArg="" - if [[ "$#" -ge "5" ]]; then + if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then skipNonVersionedFilesArg="--skip-non-versioned-files" fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + echo "Failed to install dotnet SDK from public location (exit code '$exit_code')." - if [[ -n "$runtimeArg" ]]; then - local runtimeSourceFeed='' - if [[ -n "${6:-}" ]]; then - runtimeSourceFeed="--azure-feed $6" - fi + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi - local runtimeSourceFeedKey='' - if [[ -n "${7:-}" ]]; then - # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' - # '-d'. To work around this, do a simple detection and switch the parameter - # accordingly. - decodeArg="--decode" - if base64 --help 2>&1 | grep -q "BusyBox"; then - decodeArg="-d" - fi - decodedFeedKey=`echo $7 | base64 $decodeArg` - runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" fi + decodedFeedKey=`echo $7 | base64 $decodeArg` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi - if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then - bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." - ExitWithExitCode $exit_code - } - else + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." ExitWithExitCode $exit_code + } + else + if [[ $exit_code != 0 ]]; then + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." fi + ExitWithExitCode $exit_code fi } } diff --git a/global.json b/global.json index 0f3bd14da2dd..7b7723e564fc 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20419.21" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20424.23", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20424.23" } } From 1c6bdc1d65d9986ab9c140f1fd2290080f2aa68c Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 26 Aug 2020 13:47:13 -0700 Subject: [PATCH 110/214] Fix C++/CLI (#13111) 1.Keep setting default TargetPlatformIdentifier and TargetPlatformVersion. C++/CLI has its own logic on deciding TargetPlatformVersion. Without the default TargetPlatformIdentifier to windows, it will fail the check on common target. 2.Disable CSWinRT pack auto reference when TargetPlatformIdentifier is windows 7 and above. C++/CLI does not support nuget restore which is required for Windows SDK Ref. Also, these are C# projections. 3.Do no normalize TargetPlatformVersion for C++/CLI as well as checking the support. The full version of Windows SDK is something like 10.0.18362.0. The last digit is Windows SDK build number, and digits before that (10.0.18362) is Windows API version. C++ targets and SDK has different interpretation of TargetPlatformVersion. C++ targets use the full version while SDK use Windows API version. Since the normalization and the check is for the issue 2. I disabled them all together. 4.Testing for C++/CLI. I fixed bug that in dotnet/sdk, the targeting pack is still the stage0(the older SDK that is used to build this SDK) version instead of what is in dotnet/sdk. However, that breaks all C++/CLI testing in dotnet/sdk due to these targeting pack need to download from the internet and C++/CLI does not support nuget restore. I will only add few test in dotnet/installer instead. Since C++ nuget restore support will be added later. And before that, there will be no big new feature in C++/CLI. I will also update the manual tests for net5.0 --- .../NETCoreCppCliTest/NETCoreCppCliTest.vcxproj | 2 +- .../CSConsoleApp/CSConsoleApp.csproj | 2 +- .../Microsoft.NET.TargetFrameworkInference.targets | 8 +++++--- .../targets/Microsoft.NET.Windows.targets | 5 ++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Assets/TestProjects/NETCoreCppClApp/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj b/src/Assets/TestProjects/NETCoreCppClApp/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj index c4a1ef7b05f9..8f6311bdd38a 100644 --- a/src/Assets/TestProjects/NETCoreCppClApp/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj +++ b/src/Assets/TestProjects/NETCoreCppClApp/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj @@ -13,7 +13,7 @@ 16.0 {CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A} - netcoreapp3.1 + net5.0 ManagedCProj NETCoreCppCliTest 10.0 diff --git a/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/CSConsoleApp/CSConsoleApp.csproj b/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/CSConsoleApp/CSConsoleApp.csproj index bcd4e2dbe3be..72494d46c1b8 100644 --- a/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/CSConsoleApp/CSConsoleApp.csproj +++ b/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/CSConsoleApp/CSConsoleApp.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp3.1 + net5.0 x64 x64 diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index 8d9a085d37ca..a00804849e05 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -161,7 +161,8 @@ Copyright (c) .NET Foundation. All rights reserved. /> - + + <_EnableDefaultWindowsPlatform>false false @@ -198,9 +199,10 @@ Copyright (c) .NET Foundation. All rights reserved. FormatArguments="$(SupportedOSPlatform);$(TargetPlatformVersion)"/> + + Condition="'$(TargetPlatformVersion)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) and '$(Language)' != 'C++'"> <_ValidTargetPlatformVersion Include="@(SdkSupportedTargetPlatform)" Condition="'@(SdkSupportedTargetPlatform)' != '' and $([MSBuild]::VersionEquals(%(Identity), $(TargetPlatformVersion)))" /> @@ -213,7 +215,7 @@ Copyright (c) .NET Foundation. All rights reserved. + Condition="'$(TargetPlatformVersion)' != '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), 5.0)) and '$(Language)' != 'C++'"> true <_ValidTargetPlatformVersions Condition="'@(SdkSupportedTargetPlatform)' != ''" >@(SdkSupportedTargetPlatform, '%0a') diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets index b86bf20d17e2..1d14866ca6d8 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets @@ -11,12 +11,15 @@ Copyright (c) .NET Foundation. All rights reserved. --> + + + and $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformVersion), '10.0')) + and '$(Language)' != 'C++'"> <_IncludeWindowsSDKRefFrameworkReferences>true From 6ab85f2bf2f770c83bc5ffa7439496d5d5d71820 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 15:38:18 -0700 Subject: [PATCH 111/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13128) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200826.2 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20425.5 -> To Version 5.0.0-rc.1.20426.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 5.0.0-rc.1.20425.2 -> To Version 5.0.0-rc.1.20426.2 (parent: Microsoft.WindowsDesktop.App * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200826.3 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20425.5 -> To Version 5.0.0-rc.1.20426.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 5.0.0-rc.1.20425.2 -> To Version 5.0.0-rc.1.20426.2 (parent: Microsoft.WindowsDesktop.App Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79e3ff09abb1..f5045d8350ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 55ab8ce696ea3d2458543176c79c332fecf0af6c - + https://github.com/dotnet/windowsdesktop - 7ea7eb5e005dc42988a1624734b14fd4de4cc654 + 5d6bb51520367aa4443dea346763d3887513dd3f - + https://github.com/dotnet/windowsdesktop - 7ea7eb5e005dc42988a1624734b14fd4de4cc654 + 5d6bb51520367aa4443dea346763d3887513dd3f - + https://github.com/dotnet/windowsdesktop - 7ea7eb5e005dc42988a1624734b14fd4de4cc654 + 5d6bb51520367aa4443dea346763d3887513dd3f - + https://github.com/dotnet/wpf - ff75d520118fa519b558166af462652637649e74 + a5e52db01e34eaaced7e640a86b3663885bf9639 - + https://github.com/dotnet/wpf - ff75d520118fa519b558166af462652637649e74 + a5e52db01e34eaaced7e640a86b3663885bf9639 - + https://github.com/dotnet/winforms - dd4936c5edb30c78349038737bedcce2539851a2 + 715b8f227d3c3421be94bb934d8a1ece4071463c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 180eae7101ee..b48488db8616 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20425.2 + 5.0.0-rc.1.20426.2 - 5.0.0-rc.1.20425.5 + 5.0.0-rc.1.20426.3 From 9a080e224a14d28eef7037dc4c026b023e65f849 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 23:01:19 +0000 Subject: [PATCH 112/214] Update dependencies from https://github.com/dotnet/runtime build 20200826.5 (#13138) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - System.Resources.Extensions: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5045d8350ec..dae2fa517cd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b https://github.com/dotnet/arcade 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index b48488db8616..cc1effa9376d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20424.23 3.1.0 - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20425.18 - 5.0.0-rc.1.20425.18 - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20425.18 - 5.0.0-rc.1.20425.18 - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20425.18 - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 From 2fab8a98bc746f4670ece63513ee6cf942f7bd12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 23:41:20 +0000 Subject: [PATCH 113/214] Update dependencies from https://github.com/dotnet/fsharp build 20200826.3 (#13139) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20424.2 to 11.0.0-beta.20426.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dae2fa517cd1..98584ac2db8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 384d02a5f26cb58fdd3e62b72505e318e124657c - + https://github.com/dotnet/fsharp - d7e1e6e900ff8e7bebcac25b1939f62e4997b401 + e9f8089580ae316d2a30eaabb2a85c8fb0bb1615 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index cc1effa9376d..92976a83f643 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20424.2 + 11.0.0-beta.20426.3 From eb55e7dfed0c629eabd7c47702b7eea97428da07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 00:27:27 +0000 Subject: [PATCH 114/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200826.3 (#13140) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - dotnet-watch: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - dotnet-user-secrets: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - dotnet-dev-certs: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98584ac2db8b..56b0cca33405 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 715b8f227d3c3421be94bb934d8a1ece4071463c - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 - + https://github.com/dotnet/aspnetcore - 098be5f5ee2039ff7a184a4098802537390f2b35 + e2dd2969b58a0b84a4cec5f5a737cf78d757b072 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 92976a83f643..8c94f38555b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 - 5.0.0-rc.1.20425.11 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 From 75488951c68e2a55f29ec896016020a3f122f3f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 02:49:47 +0000 Subject: [PATCH 115/214] Update dependencies from https://github.com/dotnet/fsharp build 20200826.7 (#13143) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20426.3 to 11.0.0-beta.20426.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56b0cca33405..9a2c278f0166 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 384d02a5f26cb58fdd3e62b72505e318e124657c - + https://github.com/dotnet/fsharp - e9f8089580ae316d2a30eaabb2a85c8fb0bb1615 + 9dfb86abc0093596271fceb537b7de976fdf85c7 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 8c94f38555b6..0c2b897e20ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20426.3 + 11.0.0-beta.20426.7 From a7a85d79726e1b78f37bbbb766679294e68c088c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 03:13:19 +0000 Subject: [PATCH 116/214] Update dependencies from https://github.com/dotnet/runtime build 20200826.8 (#13142) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 - System.Resources.Extensions: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a2c278f0166..f8704c19318e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f https://github.com/dotnet/arcade 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 0c2b897e20ac..6cad9a86c89a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20424.23 3.1.0 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 From ea67db7b994d881312af16f7e4dd783a1f9e2f53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 04:46:29 +0000 Subject: [PATCH 117/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200826.4 (#13148) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.1 to 5.0.0-rc.1.20426.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.1 to 5.0.0-rc.1.20426.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8704c19318e..8fa1ce878c1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 94e7aa7bc325a0b9fdc14194e5389e0f625e350f - + https://github.com/dotnet/windowsdesktop - 5d6bb51520367aa4443dea346763d3887513dd3f + bfbeae5f684ed58ed05766ebc41179f4383483dc - + https://github.com/dotnet/windowsdesktop - 5d6bb51520367aa4443dea346763d3887513dd3f + bfbeae5f684ed58ed05766ebc41179f4383483dc - + https://github.com/dotnet/windowsdesktop - 5d6bb51520367aa4443dea346763d3887513dd3f + bfbeae5f684ed58ed05766ebc41179f4383483dc - + https://github.com/dotnet/wpf - a5e52db01e34eaaced7e640a86b3663885bf9639 + aefaf67070c89815bfac11631c2d35f9335e564c - + https://github.com/dotnet/wpf - a5e52db01e34eaaced7e640a86b3663885bf9639 + aefaf67070c89815bfac11631c2d35f9335e564c - + https://github.com/dotnet/winforms - 715b8f227d3c3421be94bb934d8a1ece4071463c + 5e942afa425ae8cbf40bd4aff0a1706ce58ae820 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6cad9a86c89a..ab280a700a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20426.2 + 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.4 From b01036002d7874e92d391eff70b0deea0911e8a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 06:33:43 +0000 Subject: [PATCH 118/214] Update dependencies from https://github.com/dotnet/runtime build 20200826.10 (#13150) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 - System.Resources.Extensions: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fa1ce878c1d..7726389158e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 https://github.com/dotnet/arcade 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index ab280a700a6c..8cd3b0df8410 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20424.23 3.1.0 - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20426.8 - 5.0.0-rc.1.20426.8 - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20426.8 - 5.0.0-rc.1.20426.8 - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20426.8 - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 From e08dc0426679918e9385e7f6867e7cca36355736 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 07:39:11 +0000 Subject: [PATCH 119/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13147) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - dotnet-watch: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - dotnet-user-secrets: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - dotnet-dev-certs: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.6 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7726389158e9..d097a122f151 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 5e942afa425ae8cbf40bd4aff0a1706ce58ae820 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 - + https://github.com/dotnet/aspnetcore - e2dd2969b58a0b84a4cec5f5a737cf78d757b072 + f2b72b051166329d4c1f7a3aa5a6295883e2c334 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8cd3b0df8410..2b5a2d5e67fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 - 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.6 From 97f0ea859c8bd729306ef77d6e05a1e7768587a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 08:19:37 +0000 Subject: [PATCH 120/214] Update dependencies from https://github.com/dotnet/fsharp build 20200826.10 (#13151) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20426.7 to 11.0.0-beta.20426.10 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d097a122f151..3967539ac652 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 384d02a5f26cb58fdd3e62b72505e318e124657c - + https://github.com/dotnet/fsharp - 9dfb86abc0093596271fceb537b7de976fdf85c7 + 3b9fe3ec3ed6f154d5f4f9e4ddb62cbb83faacb7 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2b5a2d5e67fb..beab0daa8dbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20426.7 + 11.0.0-beta.20426.10 From 95f1e1241544f6a34d8403de6173cae83665129a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 09:08:02 +0000 Subject: [PATCH 121/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200826.5 (#13152) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3967539ac652..b0f9140bae76 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime bfc00e4e13578e14c4486693b3470497e3c989c2 - + https://github.com/dotnet/windowsdesktop - bfbeae5f684ed58ed05766ebc41179f4383483dc + 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 - + https://github.com/dotnet/windowsdesktop - bfbeae5f684ed58ed05766ebc41179f4383483dc + 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 - + https://github.com/dotnet/windowsdesktop - bfbeae5f684ed58ed05766ebc41179f4383483dc + 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 - + https://github.com/dotnet/wpf - aefaf67070c89815bfac11631c2d35f9335e564c + d063baa5b62abdff610c7d7ec3fdd5242ce21c7e - + https://github.com/dotnet/wpf - aefaf67070c89815bfac11631c2d35f9335e564c + d063baa5b62abdff610c7d7ec3fdd5242ce21c7e - + https://github.com/dotnet/winforms - 5e942afa425ae8cbf40bd4aff0a1706ce58ae820 + b58fc0d5af1f12f01d0780f1188cc9c4b6854a8d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index beab0daa8dbf..961ff3477142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.4 + 5.0.0-rc.1.20426.5 From b46a26f5478aabcb8d77331cf61f9838d803d5f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 13:29:01 +0000 Subject: [PATCH 122/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13153) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 - System.Resources.Extensions: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0f9140bae76..02e8fda243c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 https://github.com/dotnet/arcade 229645f3ad023a4aa2717d266cef5339dc3b5162 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 961ff3477142..cfe9eef35169 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20424.23 3.1.0 - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20426.10 - 5.0.0-rc.1.20426.10 - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20426.10 - 5.0.0-rc.1.20426.10 - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20426.10 - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 From df19f4636e2e98abc1ba3fc8f9754b6e758f20bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 07:17:38 -0700 Subject: [PATCH 123/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200826.7 (#13154) VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 , Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20426.6 -> To Version 5.0.0-rc.1.20426.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02e8fda243c1..313d2be23cb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b58fc0d5af1f12f01d0780f1188cc9c4b6854a8d - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a - + https://github.com/dotnet/aspnetcore - f2b72b051166329d4c1f7a3aa5a6295883e2c334 + bb769fe266e172478f9892f717aa0cd9725a522a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index cfe9eef35169..561f1b4c4e43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 - 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20426.7 From 37eca103c456ec9982624f2518eb2e2419d2f2ee Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 26 Aug 2020 19:39:34 -0700 Subject: [PATCH 124/214] Update test assets files to include alias information --- .../all.asset.types.project.lock.json | 49 +++++++++++++++-- .../dependencies.withgraphs.project.lock.json | 53 +++++++++++++++++-- .../LockFiles/dotnet.new.project.lock.json | 49 +++++++++++++++-- .../simple.dependencies.project.lock.json | 52 ++++++++++++++++-- 4 files changed, 189 insertions(+), 14 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/all.asset.types.project.lock.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/all.asset.types.project.lock.json index 5805a694353b..46a99924f612 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/all.asset.types.project.lock.json +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/all.asset.types.project.lock.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "targets": { ".NETCoreApp,Version=v1.0": { "Libuv/1.9.0": { @@ -210,9 +210,52 @@ "System.Spatial >= 5.7.0" ] }, - "tools": {}, - "projectFileToolGroups": {}, "packageFolders": { "C:\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "projectName": "consoletest", + "projectPath": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "packagesPath": "C:\\Users\\username\\.nuget\\packages\\", + "outputPath": "C:\\git\\repro\\consoletest\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [], + "configFilePaths": [ + "C:\\Users\\username\\AppData\\Roaming\\NuGet\\NuGet.Config" + ], + "originalTargetFrameworks": [ + "netcoreapp1.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "dependencies": { + "Microsoft.NETCore.App": { + "target": "Package", + "version": "[1.0.5, )", + "autoReferenced": true + } + }, + "runtimeIdentifierGraphPath": "C:\\git\\dotnet-sdk\\artifacts\\bin\\redist\\Debug\\dotnet\\sdk\\5.0.100-dev\\RuntimeIdentifierGraph.json" + } + } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dependencies.withgraphs.project.lock.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dependencies.withgraphs.project.lock.json index 6997e9b6f869..db171875261e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dependencies.withgraphs.project.lock.json +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dependencies.withgraphs.project.lock.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "targets": { ".NETStandard,Version=v1.6": { "Microsoft.CSharp/4.0.1": { @@ -2824,9 +2824,52 @@ "Newtonsoft.Json >= 9.0.1" ] }, - "tools": {}, - "projectFileToolGroups": {}, "packageFolders": { - "C:\\Users\\eerhardt\\.nuget\\packages\\": {} + "C:\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "projectName": "consoletest", + "projectPath": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "packagesPath": "C:\\Users\\username\\.nuget\\packages\\", + "outputPath": "C:\\git\\repro\\consoletest\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [], + "configFilePaths": [ + "C:\\Users\\username\\AppData\\Roaming\\NuGet\\NuGet.Config" + ], + "originalTargetFrameworks": [ + "netstandard1.6" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard1.6": { + "targetAlias": "netstandard1.6", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netstandard1.6": { + "targetAlias": "netstandard1.6", + "dependencies": { + "Microsoft.NETCore.App": { + "target": "Package", + "version": "[1.0.5, )", + "autoReferenced": true + } + }, + "runtimeIdentifierGraphPath": "C:\\git\\dotnet-sdk\\artifacts\\bin\\redist\\Debug\\dotnet\\sdk\\5.0.100-dev\\RuntimeIdentifierGraph.json" + } + } } -} \ No newline at end of file +} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dotnet.new.project.lock.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dotnet.new.project.lock.json index 0e2596ed077a..9c1b429f6323 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dotnet.new.project.lock.json +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/dotnet.new.project.lock.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "targets": { ".NETCoreApp,Version=v1.0": { "Libuv/1.9.0": { @@ -6592,9 +6592,52 @@ "Microsoft.NETCore.App >= 1.0.0" ] }, - "tools": {}, - "projectFileToolGroups": {}, "packageFolders": { "C:\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "projectName": "consoletest", + "projectPath": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "packagesPath": "C:\\Users\\username\\.nuget\\packages\\", + "outputPath": "C:\\git\\repro\\consoletest\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [], + "configFilePaths": [ + "C:\\Users\\username\\AppData\\Roaming\\NuGet\\NuGet.Config" + ], + "originalTargetFrameworks": [ + "netcoreapp1.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "dependencies": { + "Microsoft.NETCore.App": { + "target": "Package", + "version": "[1.0.5, )", + "autoReferenced": true + } + }, + "runtimeIdentifierGraphPath": "C:\\git\\dotnet-sdk\\artifacts\\bin\\redist\\Debug\\dotnet\\sdk\\5.0.100-dev\\RuntimeIdentifierGraph.json" + } + } } } \ No newline at end of file diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/simple.dependencies.project.lock.json b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/simple.dependencies.project.lock.json index 029c873843a4..1209d9b9be9b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/simple.dependencies.project.lock.json +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFiles/simple.dependencies.project.lock.json @@ -1,6 +1,6 @@ { "locked": false, - "version": 2, + "version": 3, "targets": { ".NETCoreApp,Version=v1.0": { "Libuv/1.9.0": { @@ -6791,6 +6791,52 @@ "System.Collections.NonGeneric >= 4.0.1" ] }, - "tools": {}, - "projectFileToolGroups": {} + "packageFolders": { + "C:\\.nuget\\packages\\": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "projectName": "consoletest", + "projectPath": "C:\\git\\repro\\consoletest\\consoletest.csproj", + "packagesPath": "C:\\Users\\username\\.nuget\\packages\\", + "outputPath": "C:\\git\\repro\\consoletest\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [], + "configFilePaths": [ + "C:\\Users\\username\\AppData\\Roaming\\NuGet\\NuGet.Config" + ], + "originalTargetFrameworks": [ + "netcoreapp1.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netcoreapp1.0": { + "targetAlias": "netcoreapp1.0", + "dependencies": { + "Microsoft.NETCore.App": { + "target": "Package", + "version": "[1.0.5, )", + "autoReferenced": true + } + }, + "runtimeIdentifierGraphPath": "C:\\git\\dotnet-sdk\\artifacts\\bin\\redist\\Debug\\dotnet\\sdk\\5.0.100-dev\\RuntimeIdentifierGraph.json" + } + } + } } \ No newline at end of file From d8cd36a59128f39af2d17b6280e1287bb19ef6be Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 27 Aug 2020 09:52:08 -0700 Subject: [PATCH 125/214] Skip tests if MSBuild version isn't high enough --- .../GivenThatWeWantToReferenceAProject.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs index b011e73c58ca..9353092d2645 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToReferenceAProject.cs @@ -48,7 +48,7 @@ public enum ReferenceBuildResult FailsBuild } - [Theory] + [RequiresMSBuildVersionTheory("16.8.0.42407")] [InlineData("net5.0-windows", "net5.0", true)] [InlineData("net5.0", "net5.0-windows", false)] [InlineData("net5.0-windows", "net5.0-windows", true)] From 437e8a214916c03901a4761f092eddf3d9f9698c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 27 Aug 2020 09:56:55 -0700 Subject: [PATCH 126/214] Update assets file tests for target framework aliases --- .../GivenAResolvePackageDependenciesTask.cs | 28 +++++----- .../LockFileSnippets.cs | 52 +++++++++++++++++-- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs index 36e0eb9f81ec..d770c7b9f246 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageDependenciesTask.cs @@ -94,7 +94,7 @@ public void ItAssignsValidParentTargetsAndPackages(string projectName) var task = GetExecutedTaskFromPrefix(projectName, out lockFile); // set of valid targets and packages - HashSet validTargets = new HashSet(lockFile.Targets.Select(x => x.Name)); + HashSet validTargets = new HashSet(lockFile.PackageSpec.TargetFrameworks.Select(tf => tf.TargetAlias)); HashSet validPackages = new HashSet(lockFile.Libraries.Select(x => $"{x.Name}/{x.Version.ToNormalizedString()}")); Func allValidParentTarget = @@ -159,7 +159,7 @@ public void ItAssignsExpectedTopLevelDependencies() topLevels.All(t => t.ItemSpec == "LibA/1.2.3").Should().BeTrue(); topLevels.Select(t => t.GetMetadata(MetadataKeys.ParentTarget)) .Should().Contain(new string[] { - ".NETCoreApp,Version=v1.0", ".NETCoreApp,Version=v1.0/osx.10.11-x64" + "netcoreapp1.0", "netcoreapp1.0/osx.10.11-x64" }); } @@ -236,14 +236,14 @@ public void ItAssignsExpectedTopLevelDependenciesFromAllTargets() topLevels.Where(t => t.ItemSpec == "LibA/1.2.3") .Select(t => t.GetMetadata(MetadataKeys.ParentTarget)) .Should().Contain(new string[] { - ".NETCoreApp,Version=v1.0", ".NETCoreApp,Version=v1.0/osx.10.11-x64" + "netcoreapp1.0", "netcoreapp1.0/osx.10.11-x64" }); topLevels.Where(t => t.ItemSpec == "LibD/1.2.3").Count().Should().Be(1); topLevels.Where(t => t.ItemSpec == "LibD/1.2.3") .Select(t => t.GetMetadata(MetadataKeys.ParentTarget)) .Should().Contain(new string[] { - ".NETCoreApp,Version=v1.0" + "netcoreapp1.0" }); } @@ -355,11 +355,11 @@ public void ItAssignsPackageDependenciesMetadata() var packageDep = task.PackageDependencies.Where(t => t.ItemSpec == "LibA/1.2.3").First(); packageDep.GetMetadata(MetadataKeys.ParentPackage).Should().BeEmpty(); - packageDep.GetMetadata(MetadataKeys.ParentTarget).Should().Be(".NETCoreApp,Version=v1.0"); + packageDep.GetMetadata(MetadataKeys.ParentTarget).Should().Be("netcoreapp1.0"); packageDep = task.PackageDependencies.Where(t => t.ItemSpec == "LibB/1.2.3").First(); packageDep.GetMetadata(MetadataKeys.ParentPackage).Should().Be("LibA/1.2.3"); - packageDep.GetMetadata(MetadataKeys.ParentTarget).Should().Be(".NETCoreApp,Version=v1.0"); + packageDep.GetMetadata(MetadataKeys.ParentTarget).Should().Be("netcoreapp1.0"); // LibC has both a package and project that depend on it var packageDeps = task.PackageDependencies.Where(t => t.ItemSpec == "LibC/1.2.3"); @@ -367,7 +367,7 @@ public void ItAssignsPackageDependenciesMetadata() packageDeps.Select(t => t.GetMetadata(MetadataKeys.ParentPackage)) .Should().Contain(new string[] { "LibB/1.2.3", "ClassLibP/1.2.3" }); packageDeps.Select(t => t.GetMetadata(MetadataKeys.ParentTarget)) - .Should().OnlyContain(s => s == ".NETCoreApp,Version=v1.0"); + .Should().OnlyContain(s => s == "netcoreapp1.0"); } [Fact] @@ -468,7 +468,7 @@ public void ItAssignsFileDependenciesMetadata() fileDeps.Select(t => t.GetMetadata(MetadataKeys.ParentPackage)) .Should().OnlyContain(s => s == "LibB/1.2.3"); fileDeps.Select(t => t.GetMetadata(MetadataKeys.ParentTarget)) - .Should().Contain(new string[] { ".NETCoreApp,Version=v1.0", ".NETCoreApp,Version=v1.0/osx.10.11-x64" }); + .Should().Contain(new string[] { "netcoreapp1.0", "netcoreapp1.0/osx.10.11-x64" }); } } } @@ -600,8 +600,8 @@ public void ItAddsAnalyzerMetadataAndFileDependencies() "analyzers/dotnet/vb/Microsoft.CodeAnalysis.VisualBasic.Analyzers.dll", }; var expectedTargets = new string[] { - ".NETCoreApp,Version=v1.0", - ".NETCoreApp,Version=v1.0/osx.10.11-x64" + "netcoreapp1.0", + "netcoreapp1.0/osx.10.11-x64" }; foreach (var analyzer in analyzers) @@ -681,8 +681,8 @@ public void ItFiltersAnalyzersByProjectLanguage() fileDefns.Count().Should().Be(3); var expectedTargets = new string[] { - ".NETCoreApp,Version=v1.0", - ".NETCoreApp,Version=v1.0/osx.10.11-x64" + "netcoreapp1.0", + "netcoreapp1.0/osx.10.11-x64" }; foreach (var analyzer in expectIncluded) @@ -749,11 +749,11 @@ public void ItUsesResolvedPackageVersionFromSameTarget() // Dep.Lib.Chi has version range [4.0.0, 5.0.0), but the version assigned // is that of the library in the same target - chiDeps.Where(t => t.GetMetadata(MetadataKeys.ParentTarget) == ".NETCoreApp,Version=v1.0") + chiDeps.Where(t => t.GetMetadata(MetadataKeys.ParentTarget) == "netcoreapp1.0") .Select(t => t.ItemSpec) .First().Should().Be("Dep.Lib.Chi/4.0.0"); - chiDeps.Where(t => t.GetMetadata(MetadataKeys.ParentTarget) == ".NETCoreApp,Version=v1.0/osx.10.11-x64") + chiDeps.Where(t => t.GetMetadata(MetadataKeys.ParentTarget) == "netcoreapp1.0/osx.10.11-x64") .Select(t => t.ItemSpec) .First().Should().Be("Dep.Lib.Chi/4.1.0"); } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFileSnippets.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFileSnippets.cs index faf3b69af72f..ae4672720cb1 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFileSnippets.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/LockFileSnippets.cs @@ -23,11 +23,57 @@ public static string CreateLockFileSnippet( ""targets"": {{{string.Join(",", targets)}}}, ""libraries"": {{{string.Join(",", libraries)}}}, {GetLogsPart(logs)} - ""projectFileDependencyGroups"": {{{string.Join(",", projectFileDependencyGroups)}}} - + ""projectFileDependencyGroups"": {{{string.Join(",", projectFileDependencyGroups)}}}, + {LockFileProjectSection} }}"; } + private static string LockFileProjectSection = @" 'project': { + 'version': '1.0.0', + 'restore': { + 'projectUniqueName': 'C:\\git\\repro\\consoletest\\consoletest.csproj', + 'projectName': 'consoletest', + 'projectPath': 'C:\\git\\repro\\consoletest\\consoletest.csproj', + 'packagesPath': 'C:\\Users\\username\\.nuget\\packages\\', + 'outputPath': 'C:\\git\\repro\\consoletest\\obj\\', + 'projectStyle': 'PackageReference', + 'fallbackFolders': [], + 'configFilePaths': [ + 'C:\\Users\\username\\AppData\\Roaming\\NuGet\\NuGet.Config' + ], + 'originalTargetFrameworks': [ + 'netcoreapp1.0' + ], + 'sources': { + 'https://api.nuget.org/v3/index.json': {} + }, + 'frameworks': { + 'netcoreapp1.0': { + 'targetAlias': 'netcoreapp1.0', + 'projectReferences': {} + } + }, + 'warningProperties': { + 'warnAsError': [ + 'NU1605' + ] + } + }, + 'frameworks': { + 'netcoreapp1.0': { + 'targetAlias': 'netcoreapp1.0', + 'dependencies': { + 'Microsoft.NETCore.App': { + 'target': 'Package', + 'version': '[1.0.5, )', + 'autoReferenced': true + } + }, + 'runtimeIdentifierGraphPath': 'C:\\git\\dotnet-sdk\\artifacts\\bin\\redist\\Debug\\dotnet\\sdk\\5.0.100-dev\\RuntimeIdentifierGraph.json' + } + } + }".Replace('\'', '"'); + private static string GetLogsPart(string[] logs) => logs == null ? string.Empty : $@" ""logs"": [{string.Join(",", logs)}], "; @@ -209,4 +255,4 @@ private static string ToStringList(params string[] members) #endregion } -} \ No newline at end of file +} From 1da63534e1ecfbfc9c57d4211081d6a5ccb35d50 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Thu, 27 Aug 2020 10:08:52 -0700 Subject: [PATCH 127/214] Reenabling project to project net5.0-windows referencing tests --- global.json | 2 +- .../GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs | 2 +- .../GiventThatWeWantDesignerSupport.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 7b7723e564fc..99643a1da3f9 100644 --- a/global.json +++ b/global.json @@ -9,7 +9,7 @@ "vs-opt": { "version": "16.9" }, - "xcopy-msbuild": "16.8.0-preview2.1" + "xcopy-msbuild": "16.8.0-preview3" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20424.23", diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs index f429af8a7c61..a45e406ed2e4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAP2PrefernceWithTargetPlatform.cs @@ -17,7 +17,7 @@ public GivenThatWeWantToBuildAP2PReferenceWithTargetPlatform(ITestOutputHelper l { } - [CoreMSBuildOnlyFact] + [Fact] public void It_builds_successfully() { var appProject = new TestProject() diff --git a/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs b/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs index 1d18b675cbd4..eebd6670e9b7 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GiventThatWeWantDesignerSupport.cs @@ -30,7 +30,7 @@ public GivenThatWeWantDesignerSupport(ITestOutputHelper log) : base(log) [InlineData("net5.0-windows")] public void It_provides_runtime_configuration_and_shadow_copy_files_via_outputgroup(string targetFramework) { - if (targetFramework == "net5.0-windows" && (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || TestContext.Current.ToolsetUnderTest.ShouldUseFullFrameworkMSBuild)) + if (targetFramework == "net5.0-windows" && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { // net5.0-windows is windows only scenario return; From e3d85d5a1c9833c5f1ed3cd1757c44eb82f1e517 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 10:29:29 -0700 Subject: [PATCH 128/214] Update dependencies from https://github.com/dotnet/arcade build 20200826.1 (#13164) Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20424.23 -> To Version 5.0.0-beta.20426.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 +-- eng/Versions.props | 4 +- eng/common/performance/blazor_perf.proj | 30 ++++++ eng/common/performance/crossgen_perf.proj | 114 +++++++++----------- eng/common/performance/performance-setup.sh | 23 ++-- global.json | 4 +- 6 files changed, 108 insertions(+), 83 deletions(-) create mode 100644 eng/common/performance/blazor_perf.proj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 313d2be23cb1..b400b52cc473 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/runtime 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + https://github.com/dotnet/arcade - 229645f3ad023a4aa2717d266cef5339dc3b5162 + 3b720900ac55e9cc3675584c41da6460d6193f37 https://github.com/dotnet/runtime @@ -179,17 +179,17 @@ - + https://github.com/dotnet/arcade - 229645f3ad023a4aa2717d266cef5339dc3b5162 + 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/arcade - 229645f3ad023a4aa2717d266cef5339dc3b5162 + 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/arcade - 229645f3ad023a4aa2717d266cef5339dc3b5162 + 3b720900ac55e9cc3675584c41da6460d6193f37 diff --git a/eng/Versions.props b/eng/Versions.props index 561f1b4c4e43..9024ea8e9e9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 1.8.0 - 5.0.0-beta.20424.23 + 5.0.0-beta.20426.1 3.1.0 5.0.0-rc.1.20427.1 4.3.0 @@ -141,7 +141,7 @@ 4.19.2 4.19.0 - 5.0.0-beta.20424.23 + 5.0.0-beta.20426.1 .exe diff --git a/eng/common/performance/blazor_perf.proj b/eng/common/performance/blazor_perf.proj new file mode 100644 index 000000000000..3b25359c4380 --- /dev/null +++ b/eng/common/performance/blazor_perf.proj @@ -0,0 +1,30 @@ + + + python3 + $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk + + + + + %(Identity) + + + + + %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ + $(ScenarioDirectory)blazor\ + + + $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ + $(ScenarioDirectory)blazor/ + + + + + $(WorkItemDirectory) + cd $(BlazorDirectory);$(Python) pre.py publish --msbuild %27/p:_TrimmerDumpDependencies=true%27 --msbuild-static AdditionalMonoLinkerOptions=%27"%24(AdditionalMonoLinkerOptions) --dump-dependencies"%27 --binlog %27./traces/blazor_publish.binlog%27 + $(Python) test.py sod --scenario-name "%(Identity)" + $(Python) post.py + + + \ No newline at end of file diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj index 3c8c33d7055c..4264920382e1 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -1,80 +1,68 @@ + + + %(Identity) + + + + py -3 - $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD% - %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts - $HELIX_CORRELATION_PAYLOAD - $(BaseDirectory)/performance + $(HelixPreCommands) + %HELIX_CORRELATION_PAYLOAD%\Core_Root + %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ + $(ScenarioDirectory)crossgen\ + $(ScenarioDirectory)crossgen2\ - - - $(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj) - --dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP + python3 - $(BaseDirectory)/Core_Root/corerun - $(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh - $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts - $(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline - $(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj - $(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet - %25 - $HELIX_WORKITEM_ROOT/testResults.xml - + $(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update + $HELIX_CORRELATION_PAYLOAD/Core_Root + $HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/ + $(ScenarioDirectory)crossgen/ + $(ScenarioDirectory)crossgen2/ + - - %(Identity) - + + + + + + + + - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - + + + $(WorkItemDirectory) + $(Python) $(CrossgenDirectory)test.py crossgen --core-root $(CoreRoot) --test-name %(Identity) + - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + $(WorkItemDirectory) + $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity) + + + + + + + 4:00 - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + 4:00 - - $(WorkItemDirectory)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + $(WorkItemDirectory) + $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp 1:00 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index b5dc8e1e7d35..806e56c6121f 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -26,6 +26,7 @@ use_baseline_core_run=true using_mono=false wasm_runtime_loc= using_wasm=false +use_latest_dotnet=false while (($# > 0)); do lowerI="$(echo $1 | awk '{print tolower($0)}')" @@ -115,7 +116,11 @@ while (($# > 0)); do configurations=$2 shift 2 ;; - --help) + --latestdotnet) + use_latest_dotnet=true + shift 1 + ;; + *) echo "Common settings:" echo " --corerootdirectory Directory where Core_Root exists, if running perf testing with --corerun" echo " --architecture Architecture of the testing being run" @@ -137,6 +142,7 @@ while (($# > 0)); do echo " --internal If the benchmarks are running as an official job." echo " --monodotnet Pass the path to the mono dotnet for mono performance testing." echo " --wasm Path to the unpacked wasm runtime pack." + echo " --latestdotnet --dotnet-versions will not be specified. --dotnet-versions defaults to LKG version in global.json " echo "" exit 0 ;; @@ -200,7 +206,7 @@ if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then fi if [[ "$wasm_runtime_loc" != "" ]]; then - configurations="CompilationMode=wasm RunKind=micro" + configurations="CompilationMode=wasm RunKind=$kind" extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter NoWASM NoMono" fi @@ -212,11 +218,12 @@ common_setup_arguments="--channel master --queue $queue --build-number $build_nu setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments" -# Get the tools section from the global.json. -# This grabs the LKG version number of dotnet and passes it to our scripts -dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'` -setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" - +if [[ "$use_latest_dotnet" = false ]]; then + # Get the tools section from the global.json. + # This grabs the LKG version number of dotnet and passes it to our scripts + dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'` + setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" +fi if [[ "$run_from_perf_repo" = true ]]; then payload_directory= @@ -267,7 +274,7 @@ Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_dire Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false -Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false +Write-PipelineSetVariable -name "Python" -value "python3" -is_multi_job_variable false Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false diff --git a/global.json b/global.json index 7b7723e564fc..8cfda7d85acc 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20424.23", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20424.23" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20426.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20426.1" } } From 3b37ab817575d5f5a9457d4bc32ee7ad15c097da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 19:05:08 +0000 Subject: [PATCH 129/214] Update dependencies from https://github.com/dotnet/runtime build 20200827.3 (#13165) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 - System.Resources.Extensions: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b400b52cc473..39719ff8924a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f https://github.com/dotnet/arcade 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 9024ea8e9e9d..54bc10c3bf88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20426.1 3.1.0 - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20427.1 - 5.0.0-rc.1.20427.1 - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20427.1 - 5.0.0-rc.1.20427.1 - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20427.1 - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 From 8119b5842df822139bb4e8ae4f4ef2beb812fd42 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Tue, 18 Aug 2020 12:15:54 -0700 Subject: [PATCH 130/214] add codestyle analyzers --- eng/Versions.props | 1 + src/Layout/redist/redist.csproj | 1 + src/Layout/redist/targets/GenerateLayout.targets | 4 ++++ .../targets/Microsoft.NET.Sdk.Analyzers.targets | 16 ++++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 54bc10c3bf88..7f286bd6d78e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,6 +114,7 @@ 3.8.0-3.20420.1 + 3.8.0-3.20418.5 diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index c3940776b922..b8779a8d1176 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -28,6 +28,7 @@ + diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index c9775ab21bc6..1bb0ea3172f4 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -35,6 +35,7 @@ $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\analyzers $(AnalyzerAssembliesDirectory)\build + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle @@ -42,11 +43,14 @@ + + + + + + + From 08916aec70a205a1a12870d2ffa441922045e884 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Tue, 18 Aug 2020 13:31:47 -0700 Subject: [PATCH 131/214] add vb code style --- eng/Versions.props | 1 + src/Layout/redist/redist.csproj | 1 + .../redist/targets/GenerateLayout.targets | 12 ++++--- .../Microsoft.NET.Sdk.Analyzers.targets | 36 ++++++++++++++----- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f286bd6d78e..0d93d89ecf34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,6 +115,7 @@ 3.8.0-3.20420.1 3.8.0-3.20418.5 + 3.8.0-3.20418.5 diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index b8779a8d1176..5d63fc080d4d 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -29,6 +29,7 @@ + diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 1bb0ea3172f4..2050ab0e00ee 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -35,7 +35,8 @@ $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\analyzers $(AnalyzerAssembliesDirectory)\build - $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle\cs + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle\vb @@ -43,14 +44,17 @@ - + + - + + - + + + + + + + + + + + + + + + + From 722dc8b66a99f7263007e94d43f30097e379e119 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Wed, 19 Aug 2020 09:52:31 -0700 Subject: [PATCH 132/214] add EnableCodeStyleAnalyzers property --- .../targets/Microsoft.NET.Sdk.Analyzers.targets | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets index b58c58828ab0..b27f67c52495 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets @@ -30,11 +30,17 @@ Copyright (c) .NET Foundation. All rights reserved. $(AnalysisLevel) - + true false + + + true + false @@ -69,7 +75,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -85,7 +91,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + From a8ba92d521a305fcb4772bdab5527096b53b9a37 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Wed, 19 Aug 2020 12:05:06 -0700 Subject: [PATCH 133/214] fixup --- .../targets/Microsoft.NET.Sdk.Analyzers.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets index b27f67c52495..ebdd7dce0f02 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets @@ -40,7 +40,7 @@ Copyright (c) .NET Foundation. All rights reserved. true - false + false From 4840f5388813c204f1797d8cae34b0bd8cad4171 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Thu, 20 Aug 2020 17:51:26 -0700 Subject: [PATCH 134/214] copy editorconfigs to the config folder --- src/Layout/redist/targets/GenerateLayout.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 2050ab0e00ee..c3713a8d46b6 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -37,6 +37,7 @@ $(AnalyzerAssembliesDirectory)\build $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle\cs $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk\codestyle\vb + $(AnalyzerTargetsDirectory)\config @@ -46,6 +47,7 @@ + @@ -55,6 +57,7 @@ + Date: Tue, 25 Aug 2020 15:15:24 -0700 Subject: [PATCH 135/214] do not auto-increment the version numbers --- src/Layout/redist/redist.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 5d63fc080d4d..c31f8da8d4a5 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -28,8 +28,8 @@ - - + + From 71fc70663dd924d049299bd80e4f81dd3ac3c731 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Tue, 25 Aug 2020 15:16:21 -0700 Subject: [PATCH 136/214] disable by default --- .../targets/Microsoft.NET.Sdk.Analyzers.targets | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets index ebdd7dce0f02..3c5ceb246d97 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets @@ -36,11 +36,8 @@ Copyright (c) .NET Foundation. All rights reserved. $([MSBuild]::VersionGreaterThanOrEquals($(EffectiveAnalysisLevel), '5.0'))">true false - - true - false + + false @@ -75,7 +72,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -91,7 +88,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + From bc3663d74647d50494e992798b2d3e3c516b0e29 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Thu, 27 Aug 2020 14:44:42 -0700 Subject: [PATCH 137/214] fixup --- eng/Versions.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0d93d89ecf34..54bc10c3bf88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -114,8 +114,6 @@ 3.8.0-3.20420.1 - 3.8.0-3.20418.5 - 3.8.0-3.20418.5 From 7659ce1caa29e357b8c6690a19db425c9993c73d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 23:48:47 +0000 Subject: [PATCH 138/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13166) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39719ff8924a..3769efd4be81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/windowsdesktop - 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 + 194ad61a7046e8affb44713978d5ac94cbb39ee1 - + https://github.com/dotnet/windowsdesktop - 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 + 194ad61a7046e8affb44713978d5ac94cbb39ee1 - + https://github.com/dotnet/windowsdesktop - 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 + 194ad61a7046e8affb44713978d5ac94cbb39ee1 - + https://github.com/dotnet/wpf - d063baa5b62abdff610c7d7ec3fdd5242ce21c7e + 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 - + https://github.com/dotnet/wpf - d063baa5b62abdff610c7d7ec3fdd5242ce21c7e + 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 - + https://github.com/dotnet/winforms - b58fc0d5af1f12f01d0780f1188cc9c4b6854a8d + 38e18b29cb92f1cc5044eaef5926fc435e0eb248 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 54bc10c3bf88..e505312e3082 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20427.2 From 62b7cdd9d2aa36e507eb570c59351527af1869cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 18:30:05 -0700 Subject: [PATCH 139/214] Update dependencies from https://github.com/dotnet/msbuild build 20200827.1 (#13177) Microsoft.Build.Localization , Microsoft.Build From Version 16.8.0-preview-20425-03 -> To Version 16.8.0-preview-20427-01 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3769efd4be81..4a8bb30bb936 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 384d02a5f26cb58fdd3e62b72505e318e124657c + 67225fa9156a9942e1eebc85cb34ef82e852e712 - + https://github.com/dotnet/msbuild - 384d02a5f26cb58fdd3e62b72505e318e124657c + 67225fa9156a9942e1eebc85cb34ef82e852e712 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e505312e3082..9f69f89a6bd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20425-03 + 16.8.0-preview-20427-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20425-03 + 16.8.0-preview-20427-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 4536693d5b019185953d527c1b147043046dcd70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 19:56:22 -0700 Subject: [PATCH 140/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200827.5 (#13180) Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20427.2 -> To Version 5.0.0-rc.1.20427.5 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 5.0.0-rc.1.20427.5 -> To Version 5.0.0-rc.1.20427.6 (parent: Microsoft.WindowsDesktop.App Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a8bb30bb936..d5be9568a2f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime ba5b5d18915eb637e53719373b857a2a310c204f - + https://github.com/dotnet/windowsdesktop - 194ad61a7046e8affb44713978d5ac94cbb39ee1 + db9aed75d442d94b3d26e589d7b37acda1b2713a - + https://github.com/dotnet/windowsdesktop - 194ad61a7046e8affb44713978d5ac94cbb39ee1 + db9aed75d442d94b3d26e589d7b37acda1b2713a - + https://github.com/dotnet/windowsdesktop - 194ad61a7046e8affb44713978d5ac94cbb39ee1 + db9aed75d442d94b3d26e589d7b37acda1b2713a - + https://github.com/dotnet/wpf - 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 + 8597e41c275681fe5e402dff4fcbffbe6bb1e499 - + https://github.com/dotnet/wpf - 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 + 8597e41c275681fe5e402dff4fcbffbe6bb1e499 - + https://github.com/dotnet/winforms - 38e18b29cb92f1cc5044eaef5926fc435e0eb248 + ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9f69f89a6bd0..c6a44b6789c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.6 - 5.0.0-rc.1.20427.2 + 5.0.0-rc.1.20427.5 From 13f2d1ef071fe25ffa2203e11e504008ebaa4ece Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 03:37:55 +0000 Subject: [PATCH 141/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200827.5 (#13182) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - dotnet-watch: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - dotnet-user-secrets: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - dotnet-dev-certs: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5be9568a2f7..029be02c3690 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 - + https://github.com/dotnet/aspnetcore - bb769fe266e172478f9892f717aa0cd9725a522a + a54c5baf7a1fbf90487f375b8dc93d55216b7944 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c6a44b6789c6..39107861ed8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 - 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 From 4de044bd2a8dc89866db7281ab8cab015c6e210e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 06:23:05 +0000 Subject: [PATCH 142/214] Update dependencies from https://github.com/dotnet/fsharp build 20200827.4 (#13183) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20426.10 to 11.0.0-beta.20427.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 029be02c3690..2bbd7cd69964 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 67225fa9156a9942e1eebc85cb34ef82e852e712 - + https://github.com/dotnet/fsharp - 3b9fe3ec3ed6f154d5f4f9e4ddb62cbb83faacb7 + 7ea76ebc69fc29f5c3b2fccfca99ac0a92026e6a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 39107861ed8b..337dfc59e0de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20426.10 + 11.0.0-beta.20427.4 From 3263f85370568315a42c914f124f0d342dd00561 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 06:57:01 +0000 Subject: [PATCH 143/214] Update dependencies from https://github.com/dotnet/runtime build 20200827.12 (#13184) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 - System.Resources.Extensions: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bbd7cd69964..c013ec62ded8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a https://github.com/dotnet/arcade 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 337dfc59e0de..a965e3f25f50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20426.1 3.1.0 - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20427.3 - 5.0.0-rc.1.20427.3 - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20427.3 - 5.0.0-rc.1.20427.3 - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20427.3 - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 From c5ced72d07db2fdd15648b9357fbb98b1088b7e9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 28 Aug 2020 00:31:27 -0700 Subject: [PATCH 144/214] Fix GetTopLevelDependencies to work with framework aliases This should fix #13190 --- .../LockFileExtensions.cs | 10 +++++++ .../ProjectContext.cs | 10 +++---- ...nThatWeWantToExcludeAPackageFromPublish.cs | 28 +++++++++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs index 99f7b425cb98..d66082e79310 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/LockFileExtensions.cs @@ -40,6 +40,16 @@ public static LockFileTarget GetTargetAndThrowIfNotFound(this LockFile lockFile, return lockFileTarget; } + public static string GetLockFileTargetAlias(this LockFile lockFile, LockFileTarget lockFileTarget) + { + var frameworkAlias = lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.FrameworkName == lockFileTarget.TargetFramework)?.TargetAlias; + if (frameworkAlias == null) + { + throw new ArgumentException("Could not find TargetFramework alias in lock file for " + lockFileTarget.TargetFramework); + } + return frameworkAlias; + } + public static ProjectContext CreateProjectContext( this LockFile lockFile, string frameworkAlias, diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index 5ad5b4cf46de..cb2905ece73e 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -79,11 +79,7 @@ public ProjectContext(LockFile lockFile, LockFileTarget lockFileTarget, } else { - var frameworkAlias = lockFile.PackageSpec.TargetFrameworks.FirstOrDefault(tfi => tfi.FrameworkName == lockFileTarget.TargetFramework)?.TargetAlias; - if (frameworkAlias == null) - { - throw new ArgumentException("Could not find TargetFramework alias in lock file for " + lockFileTarget.TargetFramework); - } + var frameworkAlias = lockFile.GetLockFileTargetAlias(lockFileTarget); CompilationLockFileTarget = lockFile.GetTargetAndThrowIfNotFound(frameworkAlias, null); } @@ -194,10 +190,12 @@ static public IEnumerable GetTopLevelDependencies(LockFile lockFile, Loc Dictionary libraryLookup = lockFileTarget.Libraries.ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase); + var frameworkAlias = lockFile.GetLockFileTargetAlias(lockFileTarget); + return lockFile .ProjectFileDependencyGroups .Where(dg => dg.FrameworkName == string.Empty || - dg.FrameworkName == lockFileTarget.TargetFramework.DotNetFrameworkName) + dg.FrameworkName == frameworkAlias) .SelectMany(g => g.Dependencies) .Select(projectFileDependency => { diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs index 81f31951bb76..fdc7a8c050a0 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToExcludeAPackageFromPublish.cs @@ -193,5 +193,33 @@ public void TransitiveNetStandardPackageReferenceAndPublishFalse() publishCommand.Execute().Should().Pass(); } + + [Fact] + public void It_does_not_exclude_packages_depended_on_by_non_privateassets_references() + { + var testProject = new TestProject() + { + Name = "PrivateAssetsTransitive", + IsSdkProject = true, + IsExe = true, + TargetFrameworks = "net5.0" + }; + + // Both these packages depend on NewtonSoft.Json. Since only one of the package references specifies PrivateAssets=All, + // NewtonSoft.Json should be included in the publish output + testProject.PackageReferences.Add(new TestPackageReference("Newtonsoft.Json.Schema", "3.0.13")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.Extensions.DependencyModel", "3.1.6", privateAssets: "all")); + + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + publishCommand.Execute().Should().Pass(); + + var publishDirectory = publishCommand.GetOutputDirectory(testProject.TargetFrameworks); + + publishDirectory.Should().HaveFile("Newtonsoft.Json.dll"); + publishDirectory.Should().HaveFile("Newtonsoft.Json.Schema.dll"); + publishDirectory.Should().NotHaveFile("Microsoft.Extensions.DependencyModel"); + } } } From b57a6be530427fe1fcbd13f432a014eec90be728 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 09:20:07 +0000 Subject: [PATCH 145/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13185) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - dotnet-watch: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - dotnet-user-secrets: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - dotnet-dev-certs: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c013ec62ded8..05d78c2ba183 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a - + https://github.com/dotnet/aspnetcore - a54c5baf7a1fbf90487f375b8dc93d55216b7944 + 966aa02ccdd77eb53934271055e71985d2a5d39a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a965e3f25f50..751be3722ea5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 - 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.7 From 1ece74592fb8518e7e70bdefb05c0453ca24bd4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 09:26:18 +0000 Subject: [PATCH 146/214] Update dependencies from https://github.com/dotnet/fsharp build 20200827.5 (#13186) [release/5.0.1xx] Update dependencies from dotnet/fsharp - Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20427.4 to 11.0.0-beta.20427.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05d78c2ba183..f62f0f56d6aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 67225fa9156a9942e1eebc85cb34ef82e852e712 - + https://github.com/dotnet/fsharp - 7ea76ebc69fc29f5c3b2fccfca99ac0a92026e6a + fe7efc4717eec6e2ed5257e4caa34d0a3f3e9dd2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 751be3722ea5..d3864f3e9b60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20427.4 + 11.0.0-beta.20427.5 From 0fd9b90fc6e4c6f208017ee7e1d7871c1ed9c8ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 10:04:15 +0000 Subject: [PATCH 147/214] Update dependencies from https://github.com/dotnet/runtime build 20200827.16 (#13189) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 - System.Resources.Extensions: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f62f0f56d6aa..db9faf659947 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 https://github.com/dotnet/arcade 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index d3864f3e9b60..7c73202df473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20426.1 3.1.0 - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20427.12 - 5.0.0-rc.1.20427.12 - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20427.12 - 5.0.0-rc.1.20427.12 - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20427.12 - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 From fe22ff4c4646807b891f2821f53873f3e440e343 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 11:48:18 +0000 Subject: [PATCH 148/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200828.1 (#13191) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db9faf659947..0d1fc54e8c37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/windowsdesktop - db9aed75d442d94b3d26e589d7b37acda1b2713a + 53ce4bf78c6ceae642d2435224b8e2b46816e507 - + https://github.com/dotnet/windowsdesktop - db9aed75d442d94b3d26e589d7b37acda1b2713a + 53ce4bf78c6ceae642d2435224b8e2b46816e507 - + https://github.com/dotnet/windowsdesktop - db9aed75d442d94b3d26e589d7b37acda1b2713a + 53ce4bf78c6ceae642d2435224b8e2b46816e507 - + https://github.com/dotnet/wpf - 8597e41c275681fe5e402dff4fcbffbe6bb1e499 + 8cf5ebee8056067861612e3f71d33b1b8900e091 - + https://github.com/dotnet/wpf - 8597e41c275681fe5e402dff4fcbffbe6bb1e499 + 8cf5ebee8056067861612e3f71d33b1b8900e091 - + https://github.com/dotnet/winforms - ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 + b30494faa02bab485b6061387b80bceefdb81c2c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7c73202df473..bf64e48e5029 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20427.6 + 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20428.1 From a7ad36035a5a517e45ebd382e76273909a768eb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 12:00:19 +0000 Subject: [PATCH 149/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200827.9 (#13192) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - dotnet-watch: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - dotnet-user-secrets: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - dotnet-dev-certs: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d1fc54e8c37..4240e13fd3d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b30494faa02bab485b6061387b80bceefdb81c2c - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 - + https://github.com/dotnet/aspnetcore - 966aa02ccdd77eb53934271055e71985d2a5d39a + d85ac164983914ee23ee9009f7732b26630cbfe8 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index bf64e48e5029..ddb532da57e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20427.9 From 76686bb6d7c4f9952b78f0311a2b714c4fcd4806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 14:51:50 +0000 Subject: [PATCH 150/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200828.2 (#13197) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4240e13fd3d6..82232694c50f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime cb2023c5fc31d447227cf21eb360e356b79284e8 - + https://github.com/dotnet/windowsdesktop - 53ce4bf78c6ceae642d2435224b8e2b46816e507 + e6a25e7a2714e1784ee4d8a62efad951f0527eb3 - + https://github.com/dotnet/windowsdesktop - 53ce4bf78c6ceae642d2435224b8e2b46816e507 + e6a25e7a2714e1784ee4d8a62efad951f0527eb3 - + https://github.com/dotnet/windowsdesktop - 53ce4bf78c6ceae642d2435224b8e2b46816e507 + e6a25e7a2714e1784ee4d8a62efad951f0527eb3 - + https://github.com/dotnet/wpf - 8cf5ebee8056067861612e3f71d33b1b8900e091 + 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 - + https://github.com/dotnet/wpf - 8cf5ebee8056067861612e3f71d33b1b8900e091 + 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 - + https://github.com/dotnet/winforms - b30494faa02bab485b6061387b80bceefdb81c2c + 3789739a2b727555d562523c3d5bb114c780cc64 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ddb532da57e8..8b4681930bf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20428.1 - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.2 From 534223256142928d67f5ab6f3c28870cdcbccfff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:32:19 +0000 Subject: [PATCH 151/214] Update dependencies from https://github.com/microsoft/vstest build 20200828-02 (#13202) [release/5.0.1xx] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200825-03 to 16.8.0-release-20200828-02 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82232694c50f..1affe5710093 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ https://github.com/NuGet/NuGet.Client 3501ddedc274ac10d4b135856b7593a6bb8a72f1 - + https://github.com/microsoft/vstest - c1a6782a8158fc73ccc116eeee1ab6ccce0a620b + 4fcacb284064e66e670689b9888c0c438b1f4154 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 8b4681930bf5..20a215e4ef70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ - 16.8.0-release-20200825-03 + 16.8.0-release-20200828-02 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 188aa96a43b33c26687d0fca4425285b87e663c6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 28 Aug 2020 09:28:09 -0700 Subject: [PATCH 152/214] Fix GetTopLevelDependencies (and hence various publish scenarios) --- src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs index cb2905ece73e..57692b0e4678 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProjectContext.cs @@ -190,12 +190,12 @@ static public IEnumerable GetTopLevelDependencies(LockFile lockFile, Loc Dictionary libraryLookup = lockFileTarget.Libraries.ToDictionary(l => l.Name, StringComparer.OrdinalIgnoreCase); - var frameworkAlias = lockFile.GetLockFileTargetAlias(lockFileTarget); + string lockFileTargetFramework = lockFileTarget.Name.Split('/')[0]; return lockFile .ProjectFileDependencyGroups .Where(dg => dg.FrameworkName == string.Empty || - dg.FrameworkName == frameworkAlias) + dg.FrameworkName == lockFileTargetFramework) .SelectMany(g => g.Dependencies) .Select(projectFileDependency => { From b4865cdf483ff0e319ab441bb878286a85018a85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:18:45 +0000 Subject: [PATCH 153/214] Update dependencies from https://github.com/dotnet/runtime build 20200828.3 (#13204) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 - System.Resources.Extensions: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1affe5710093..c9b33891d876 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f https://github.com/dotnet/arcade 3b720900ac55e9cc3675584c41da6460d6193f37 - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker d0e680359c03a75f2c5f624783b3351a3ae42007 - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 20a215e4ef70..053d5a60f7f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20426.1 3.1.0 - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20427.16 - 5.0.0-rc.1.20427.16 - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20427.16 - 5.0.0-rc.1.20427.16 - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20427.16 - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 From 2b9442184141b861081de43b180a509dbf6b05af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 11:20:07 -0700 Subject: [PATCH 154/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200828.2 (#13203) VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 , Microsoft.NET.Sdk.Razor , dotnet-watch , dotnet-user-secrets , dotnet-dev-certs , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.Components.Analyzers , Microsoft.NET.Sdk.BlazorWebAssembly , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Analyzers From Version 5.0.0-rc.1.20427.9 -> To Version 5.0.0-rc.1.20428.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9b33891d876..7a22dce67727 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 3789739a2b727555d562523c3d5bb114c780cc64 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 - + https://github.com/dotnet/aspnetcore - d85ac164983914ee23ee9009f7732b26630cbfe8 + 94b3e7effd39c1cd777fdea93659130f90f5c428 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 053d5a60f7f8..8f6334804e8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 - 5.0.0-rc.1.20427.9 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 From b2907b76a5c79eece95efee3fdae8601f15fa943 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 19:04:21 +0000 Subject: [PATCH 155/214] Update dependencies from https://github.com/dotnet/msbuild build 20200828.1 (#13210) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20427-01 to 16.8.0-preview-20428-01 - Microsoft.Build: from 16.8.0-preview-20427-01 to 16.8.0-preview-20428-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a22dce67727..18460ea08df1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 67225fa9156a9942e1eebc85cb34ef82e852e712 + 7215a4d35b155c42c7d270d49f316c2eb77eff9a - + https://github.com/dotnet/msbuild - 67225fa9156a9942e1eebc85cb34ef82e852e712 + 7215a4d35b155c42c7d270d49f316c2eb77eff9a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8f6334804e8e..d5138dfae30d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20427-01 + 16.8.0-preview-20428-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20427-01 + 16.8.0-preview-20428-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From e35c9de108599437ddd96489e8430e293321f17e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 13:10:51 -0700 Subject: [PATCH 156/214] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20200828.5 (#13212) Microsoft.CodeAnalysis.NetAnalyzers From Version 5.0.0-rc2.20419.2 -> To Version 5.0.0-rc1.20428.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18460ea08df1..629240640826 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,9 +173,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/roslyn-analyzers - cd93448a143d3780858d595ad5351672e125e0a3 + 5fd2c12475a0c48f9c4bfc51eb7f13edbddb7df8 diff --git a/eng/Versions.props b/eng/Versions.props index d5138dfae30d..23415aa2731a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 5.0.0-rc2.20419.2 + 5.0.0-rc1.20428.5 From 747aadb5f2663e90208ccb5d05fbbb813fca9474 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 21:27:33 +0000 Subject: [PATCH 157/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200828.4 (#13213) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - dotnet-watch: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - dotnet-user-secrets: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - dotnet-dev-certs: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 629240640826..2722465af4ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 3789739a2b727555d562523c3d5bb114c780cc64 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 - + https://github.com/dotnet/aspnetcore - 94b3e7effd39c1cd777fdea93659130f90f5c428 + 748b368d54b2ff841789d24c3c83a555bd38cc63 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 23415aa2731a..2505dc01661f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 - 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.4 From 6fdc9be87500924bad03ae0cb1c1d91e7489dd9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 21:52:38 +0000 Subject: [PATCH 158/214] [release/5.0.1xx] Update dependencies from dotnet/msbuild (#13216) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20428-02 to 16.8.0-preview-20428-03 - Microsoft.Build: from 16.8.0-preview-20428-02 to 16.8.0-preview-20428-03 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2722465af4ce..edd0b5d601e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 7215a4d35b155c42c7d270d49f316c2eb77eff9a + 091189a221523360d07dbe53d2755e062d3912cc - + https://github.com/dotnet/msbuild - 7215a4d35b155c42c7d270d49f316c2eb77eff9a + 091189a221523360d07dbe53d2755e062d3912cc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2505dc01661f..e68aa5448538 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20428-01 + 16.8.0-preview-20428-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20428-01 + 16.8.0-preview-20428-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From d72914ac381e2cf70ccc9645a2a404c9edca2f91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 22:41:49 +0000 Subject: [PATCH 159/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200828.5 (#13217) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edd0b5d601e5..33ac871dfd0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/windowsdesktop - e6a25e7a2714e1784ee4d8a62efad951f0527eb3 + e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 - + https://github.com/dotnet/windowsdesktop - e6a25e7a2714e1784ee4d8a62efad951f0527eb3 + e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 - + https://github.com/dotnet/windowsdesktop - e6a25e7a2714e1784ee4d8a62efad951f0527eb3 + e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 - + https://github.com/dotnet/wpf - 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 + e83115f008844bb8b63dc5914bf085af01cb7e6e - + https://github.com/dotnet/wpf - 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 + e83115f008844bb8b63dc5914bf085af01cb7e6e - + https://github.com/dotnet/winforms - 3789739a2b727555d562523c3d5bb114c780cc64 + b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e68aa5448538..0f355ec2e2ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.5 From cd1948eb064b1f5974a04888bd2baf92fdee427b Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Fri, 28 Aug 2020 15:48:03 -0700 Subject: [PATCH 160/214] Update Microsoft.NET.Sdk.Analyzers.targets Unconditionally import 'Microsoft.CodeAnalysis.NetAnalyzers.props' for supporting https://github.com/dotnet/roslyn-analyzers/issues/3977 See https://github.com/dotnet/roslyn-analyzers/pull/4092 for details --- .../targets/Microsoft.NET.Sdk.Analyzers.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets index 3c5ceb246d97..b67022ea42d2 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets @@ -51,8 +51,8 @@ Copyright (c) .NET Foundation. All rights reserved. '$(AnalysisLevel)' == 'preview'">9999 - + + From 190a4a5f25472d7be5c51e39b6bc11e80fdd8b41 Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Fri, 28 Aug 2020 15:53:15 -0700 Subject: [PATCH 161/214] Update Microsoft.NET.Sdk.Analyzers.targets Address feedback --- .../targets/Microsoft.NET.Sdk.Analyzers.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets index b67022ea42d2..8c9b7f0ccd6b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Analyzers.targets @@ -51,8 +51,9 @@ Copyright (c) .NET Foundation. All rights reserved. '$(AnalysisLevel)' == 'preview'">9999 - - + + From 547e2b3eb79e1fcd668177458ddabadc13c649fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 00:02:59 +0000 Subject: [PATCH 162/214] Update dependencies from https://github.com/dotnet/arcade build 20200827.5 (#13218) [release/5.0.1xx] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.XUnitExtensions: from 5.0.0-beta.20426.1 to 5.0.0-beta.20427.5 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20426.1 to 5.0.0-beta.20427.5 - Microsoft.DotNet.SignTool: from 5.0.0-beta.20426.1 to 5.0.0-beta.20427.5 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20426.1 to 5.0.0-beta.20427.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates/post-build/post-build.yml | 19 ++++++++++++++++++- eng/common/tools.ps1 | 4 ---- eng/common/tools.sh | 4 ---- global.json | 4 ++-- 6 files changed, 30 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33ac871dfd0d..770b1676aa94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/arcade - 3b720900ac55e9cc3675584c41da6460d6193f37 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 https://github.com/dotnet/runtime @@ -179,17 +179,17 @@ - + https://github.com/dotnet/arcade - 3b720900ac55e9cc3675584c41da6460d6193f37 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/arcade - 3b720900ac55e9cc3675584c41da6460d6193f37 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/arcade - 3b720900ac55e9cc3675584c41da6460d6193f37 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 diff --git a/eng/Versions.props b/eng/Versions.props index 0f355ec2e2ab..c80c3605af78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 1.8.0 - 5.0.0-beta.20426.1 + 5.0.0-beta.20427.5 3.1.0 5.0.0-rc.1.20428.3 4.3.0 @@ -141,7 +141,7 @@ 4.19.2 4.19.0 - 5.0.0-beta.20426.1 + 5.0.0-beta.20427.5 .exe diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 030808632f05..630a99d4dda3 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -56,6 +56,7 @@ parameters: NetEngServicesProdChannelId: 679 Net5Preview8ChannelId: 1155 Net5RC1ChannelId: 1157 + Net5RC2ChannelId: 1329 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 NetCoreSDK314xxChannelId: 921 @@ -91,7 +92,7 @@ stages: inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1 arguments: -PromoteToChannels "$(TargetChannels)" - -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - job: displayName: NuGet Validation @@ -329,6 +330,22 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_RC2_Publish' + channelName: '.NET 5 RC 2' + akaMSChannelName: 'net5/rc2' + channelId: ${{ parameters.Net5RC2ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: BARBuildId: ${{ parameters.BARBuildId }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 408a3cdee5ae..c2e575c97ccb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -606,11 +606,7 @@ function MSBuild() { if ($pipelinesLog) { $buildTool = InitializeBuildTool - # Work around issues with Azure Artifacts credential provider - # https://github.com/dotnet/arcade/issues/3932 if ($ci -and $buildTool.Tool -eq 'dotnet') { - dotnet nuget locals http-cache -c - $env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20 $env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20 Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20' diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a0650dda17c9..2be5cba3070b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -395,11 +395,7 @@ function MSBuild { InitializeBuildTool InitializeToolset - # Work around issues with Azure Artifacts credential provider - # https://github.com/dotnet/arcade/issues/3932 if [[ "$ci" == true ]]; then - "$_InitializeBuildTool" nuget locals http-cache -c - export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20 export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" diff --git a/global.json b/global.json index 5f2dd1af98c7..87ff39019c2b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20426.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20426.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20427.5" } } From 77efdc08a86e79c017bb8593290fa04f344f7009 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 01:14:20 +0000 Subject: [PATCH 163/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200828.8 (#13220) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - dotnet-watch: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - dotnet-user-secrets: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - dotnet-dev-certs: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.8 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 770b1676aa94..ef2c4c7e5a66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c80c3605af78..f5c620da36c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.8 From 0081a88cee928535e00f347e7b6ddba8dcb57015 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 04:37:07 +0000 Subject: [PATCH 164/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200828.10 (#13230) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - dotnet-watch: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - dotnet-user-secrets: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - dotnet-dev-certs: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20428.10 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef2c4c7e5a66..8106f016a8b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - e272a00bcfbb2b6b305e2b1db605ebd99a8bfa52 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f5c620da36c6..04e64c8d8a10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.10 From 2ced96684e64eeb7296aa97104e03349d6b6eb91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 07:40:44 +0000 Subject: [PATCH 165/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13232) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - dotnet-watch: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - dotnet-user-secrets: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - dotnet-dev-certs: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20428.14 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8106f016a8b1..db938d3e2fe6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f82794a6cb13af7e7636b80ae236c7cb2c4399cb https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 04e64c8d8a10..d39750fdae78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 - 5.0.0-rc.1.20428.10 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.14 From 19d745b732e7272191819291f35b43be11f84b8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 10:17:26 +0000 Subject: [PATCH 166/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200828.16 (#13235) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - dotnet-watch: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - dotnet-user-secrets: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - dotnet-dev-certs: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.14 to 5.0.0-rc.1.20428.16 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db938d3e2fe6..56a228db4193 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - f82794a6cb13af7e7636b80ae236c7cb2c4399cb + f891c2b15dd5b955968de16ad616e520b76475ee https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d39750fdae78..682ce545f014 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 - 5.0.0-rc.1.20428.14 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20428.16 From 071cf3bf25d1d5a27603c2867d41e3cd2777d320 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 12:47:15 +0000 Subject: [PATCH 167/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200829.2 (#13238) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - dotnet-watch: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - dotnet-user-secrets: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - dotnet-dev-certs: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.2 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56a228db4193..6b62ddb6dc03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 4a0b2a3b94232f814582e19e8fdd796b756c47ec https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 682ce545f014..9b35ed3528e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 - 5.0.0-rc.1.20428.16 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 From 09b6c00ed4b1281cfaef0469ad47ca7c4ace4536 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 15:15:14 +0000 Subject: [PATCH 168/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200829.4 (#13243) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - dotnet-watch: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - dotnet-user-secrets: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - dotnet-dev-certs: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.4 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b62ddb6dc03..735f671a869c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - 4a0b2a3b94232f814582e19e8fdd796b756c47ec + 44175edd79d385e7b138d00da99a883125e0dcda https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 9b35ed3528e2..43c14c34752c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.4 From d3ea76783c8184a39f4d08556420f723672b1399 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 10:03:58 -0700 Subject: [PATCH 169/214] Update dependencies from https://github.com/dotnet/fsharp build 20200828.2 (#13226) Microsoft.FSharp.Compiler From Version 11.0.0-beta.20427.5 -> To Version 11.0.0-beta.20428.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 735f671a869c..3574294a15f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,9 +57,9 @@ https://github.com/dotnet/msbuild 091189a221523360d07dbe53d2755e062d3912cc - + https://github.com/dotnet/fsharp - fe7efc4717eec6e2ed5257e4caa34d0a3f3e9dd2 + 068ebd3c599bc5a47163a18b8b90d2fe5517186e https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 43c14c34752c..e8b2f73ea52f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,7 +109,7 @@ - 11.0.0-beta.20427.5 + 11.0.0-beta.20428.2 From e4e2d8a47c8d95788c9b52ef437834f03a208b59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 10:04:21 -0700 Subject: [PATCH 170/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13223) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200828.6 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20428.5 -> To Version 5.0.0-rc.1.20428.6 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-rc.1.20428.3 -> To Version 5.0.0-rc.1.20428.6 (parent: Microsoft.WindowsDesktop.App * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200828.11 Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20428.5 -> To Version 5.0.0-rc.1.20428.11 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-rc.1.20428.3 -> To Version 5.0.0-rc.1.20428.8 (parent: Microsoft.WindowsDesktop.App Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3574294a15f2..a004631aa2e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,25 +105,25 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/windowsdesktop - e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 + c27052ab6100eac5682d62a0dca38ae6bddfa6b9 - + https://github.com/dotnet/windowsdesktop - e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 + c27052ab6100eac5682d62a0dca38ae6bddfa6b9 - + https://github.com/dotnet/windowsdesktop - e1e2b2ac467d344dd6ae0c1e359a5139455c34d5 + c27052ab6100eac5682d62a0dca38ae6bddfa6b9 - + https://github.com/dotnet/wpf - e83115f008844bb8b63dc5914bf085af01cb7e6e + 20c4aa126ccd150466c6074ac01218ed742311ae - + https://github.com/dotnet/wpf - e83115f008844bb8b63dc5914bf085af01cb7e6e + 20c4aa126ccd150466c6074ac01218ed742311ae https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index e8b2f73ea52f..2b6e1bdb3df7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.8 - 5.0.0-rc.1.20428.5 + 5.0.0-rc.1.20428.11 From f721259bfd6fff43dae909bd491c8b53102c636a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 19:06:45 +0000 Subject: [PATCH 171/214] Update dependencies from https://github.com/dotnet/msbuild build 20200829.1 (#13229) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20428-03 to 16.8.0-preview-20429-01 - Microsoft.Build: from 16.8.0-preview-20428-03 to 16.8.0-preview-20429-01 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a004631aa2e3..cf9409f3ebb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - 091189a221523360d07dbe53d2755e062d3912cc + d58e2b7864627321d75b7a47850e9b80deac7db6 - + https://github.com/dotnet/msbuild - 091189a221523360d07dbe53d2755e062d3912cc + d58e2b7864627321d75b7a47850e9b80deac7db6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2b6e1bdb3df7..73efbe90570d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20428-03 + 16.8.0-preview-20429-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20428-03 + 16.8.0-preview-20429-01 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) From 0b811aa33fce54d2004fb0f0b3ea2c857a6dc43c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 12:39:30 -0700 Subject: [PATCH 172/214] [release/5.0.1xx] Update dependencies from dotnet/roslyn-analyzers (#13227) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20200828.9 Microsoft.CodeAnalysis.NetAnalyzers From Version 5.0.0-rc1.20428.5 -> To Version 5.0.0-rc1.20428.9 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20200828.12 Microsoft.CodeAnalysis.NetAnalyzers From Version 5.0.0-rc1.20428.5 -> To Version 5.0.0-rc1.20428.12 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf9409f3ebb4..6e7394886167 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,9 +173,9 @@ https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 - + https://github.com/dotnet/roslyn-analyzers - 5fd2c12475a0c48f9c4bfc51eb7f13edbddb7df8 + e856dc126950463c13226c7437fc7e9fb41442dc diff --git a/eng/Versions.props b/eng/Versions.props index 73efbe90570d..64d26224bcf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 5.0.0-rc1.20428.5 + 5.0.0-rc1.20428.12 From f8085bce6422bd1b353ed3b983a162d878e47d83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 20:06:28 +0000 Subject: [PATCH 173/214] Update dependencies from https://github.com/mono/linker build 20200828.1 (#13221) [release/5.0.1xx] Update dependencies from mono/linker - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20424.5 to 5.0.0-rc.1.20428.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e7394886167..2263579b4c42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ https://github.com/microsoft/vstest 4fcacb284064e66e670689b9888c0c438b1f4154 - + https://github.com/mono/linker - d0e680359c03a75f2c5f624783b3351a3ae42007 + 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 64d26224bcf2..181381b86487 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ - 5.0.0-rc.1.20424.5 + 5.0.0-rc.1.20428.1 From 79e262a93e0dd963f54fa3cb66b686946bebb8e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 21:38:07 +0000 Subject: [PATCH 174/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200829.2 (#13244) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2263579b4c42..d5e8497380a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,25 +105,25 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/windowsdesktop - c27052ab6100eac5682d62a0dca38ae6bddfa6b9 + 4d27113d14545ac66c90a7f95d41f2db88222dd7 - + https://github.com/dotnet/windowsdesktop - c27052ab6100eac5682d62a0dca38ae6bddfa6b9 + 4d27113d14545ac66c90a7f95d41f2db88222dd7 - + https://github.com/dotnet/windowsdesktop - c27052ab6100eac5682d62a0dca38ae6bddfa6b9 + 4d27113d14545ac66c90a7f95d41f2db88222dd7 - + https://github.com/dotnet/wpf - 20c4aa126ccd150466c6074ac01218ed742311ae + ef2d4afbd427a894fc0c001c4baeb0d3acdded44 - + https://github.com/dotnet/wpf - 20c4aa126ccd150466c6074ac01218ed742311ae + ef2d4afbd427a894fc0c001c4baeb0d3acdded44 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 181381b86487..f52a28dd8e59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20428.11 + 5.0.0-rc.1.20429.2 From 77b00c51d54023c5ffbec31b23db4831a59f0a91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 00:05:33 +0000 Subject: [PATCH 175/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200829.3 (#13247) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5e8497380a9..96b2a1057de5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/windowsdesktop - 4d27113d14545ac66c90a7f95d41f2db88222dd7 + b57f5af941560761d31f6e6e2abb5baffc3c315e - + https://github.com/dotnet/windowsdesktop - 4d27113d14545ac66c90a7f95d41f2db88222dd7 + b57f5af941560761d31f6e6e2abb5baffc3c315e - + https://github.com/dotnet/windowsdesktop - 4d27113d14545ac66c90a7f95d41f2db88222dd7 + b57f5af941560761d31f6e6e2abb5baffc3c315e - + https://github.com/dotnet/wpf - ef2d4afbd427a894fc0c001c4baeb0d3acdded44 + 5a18148b821e48b09fa09d66b470f992449b4735 - + https://github.com/dotnet/wpf - ef2d4afbd427a894fc0c001c4baeb0d3acdded44 + 5a18148b821e48b09fa09d66b470f992449b4735 - + https://github.com/dotnet/winforms - b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 + 16c91865e53aeaf19dd4461e6614584e92810258 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f52a28dd8e59..12f38f4b914e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.3 From 44e293a0911ae3edee2dc71d8bfd8c76be8cb4dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 02:05:21 +0000 Subject: [PATCH 176/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200829.5 (#13248) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - dotnet-watch: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - dotnet-user-secrets: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - dotnet-dev-certs: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96b2a1057de5..5f8643ee4492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 16c91865e53aeaf19dd4461e6614584e92810258 - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a - + https://github.com/dotnet/aspnetcore - 44175edd79d385e7b138d00da99a883125e0dcda + b3b3cb66639004d9240d338dceefb5c7adb2d33a https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 12f38f4b914e..c9396ddac764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 - 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 From 3369f36d7286f01c3ea887786ea3090222e632f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 02:23:17 +0000 Subject: [PATCH 177/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13249) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20429.2 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20429.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f8643ee4492..73ab6fae52b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/windowsdesktop - b57f5af941560761d31f6e6e2abb5baffc3c315e + 126392251c4aa36a34224a842f29e5cbb28c0876 - + https://github.com/dotnet/windowsdesktop - b57f5af941560761d31f6e6e2abb5baffc3c315e + 126392251c4aa36a34224a842f29e5cbb28c0876 - + https://github.com/dotnet/windowsdesktop - b57f5af941560761d31f6e6e2abb5baffc3c315e + 126392251c4aa36a34224a842f29e5cbb28c0876 - + https://github.com/dotnet/wpf - 5a18148b821e48b09fa09d66b470f992449b4735 + 5d292c5f6bfd9c64ac20816f42309213871a0ff4 - + https://github.com/dotnet/wpf - 5a18148b821e48b09fa09d66b470f992449b4735 + 5d292c5f6bfd9c64ac20816f42309213871a0ff4 - + https://github.com/dotnet/winforms - 16c91865e53aeaf19dd4461e6614584e92810258 + 6186819240e9556694415444e117e148ccf17a8b https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c9396ddac764..887d71a9d5cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.5 From 617ff8f8a4da10e01c0ff8b270b2cf22c935ef10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 04:46:36 +0000 Subject: [PATCH 178/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200829.6 (#13250) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - dotnet-watch: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - dotnet-user-secrets: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - dotnet-dev-certs: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73ab6fae52b6..aca7f6a0f904 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 6186819240e9556694415444e117e148ccf17a8b - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 - + https://github.com/dotnet/aspnetcore - b3b3cb66639004d9240d338dceefb5c7adb2d33a + 5292fed7909a8fe35c6a0de40ffca25868e79db5 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 887d71a9d5cc..66d7c5e6afbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 - 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.6 From 051a8a311a4de4455cd463078868d4be7c7298dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 04:54:46 +0000 Subject: [PATCH 179/214] Update dependencies from https://github.com/dotnet/templating build 20200828.2 (#13222) [release/5.0.1xx] Update dependencies from dotnet/templating - Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20424.2 to 5.0.0-rc.1.20428.2 - Microsoft.TemplateEngine.Cli: from 5.0.0-rc.1.20424.2 to 5.0.0-rc.1.20428.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aca7f6a0f904..39a753dcdbf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 33ab866736b99a365bc18640ebab4e6be75d69bf + 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/templating - 33ab866736b99a365bc18640ebab4e6be75d69bf + 5334768439d060fdbc97779bc687ecbe347dff3d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 66d7c5e6afbf..ca5f26c6d573 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 5.0.0-rc.1.20424.2 + 5.0.0-rc.1.20428.2 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 5be6fde57e6ef096f843af63c54bf70d0b3c46b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 07:37:51 +0000 Subject: [PATCH 180/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13252) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - dotnet-watch: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - dotnet-user-secrets: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - dotnet-dev-certs: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20429.7 to 5.0.0-rc.1.20429.8 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39a753dcdbf0..890f748fa1d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 6186819240e9556694415444e117e148ccf17a8b - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df - + https://github.com/dotnet/aspnetcore - 5292fed7909a8fe35c6a0de40ffca25868e79db5 + b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ca5f26c6d573..9aa733e11b5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 - 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20429.8 From 561a55860ea688a2a557301b9ab6b0a718fdcfcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 07:54:29 +0000 Subject: [PATCH 181/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13228) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 - System.Resources.Extensions: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20429.3 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 890f748fa1d5..54c289fa65ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + ef47b653d657edc4235e79a16a21dd8302e195b8 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 9aa733e11b5e..d21b215cdf47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20427.5 3.1.0 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20429.3 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20429.3 From 27b46f96c9cdbbff0bb49b80006174be2f9c50fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 00:10:31 +0000 Subject: [PATCH 182/214] Update dependencies from https://github.com/dotnet/runtime build 20200830.5 (#13253) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 - System.Resources.Extensions: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54c289fa65ad..b6b15f20b244 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index d21b215cdf47..6b8ba50f2d9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20427.5 3.1.0 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 From 2cdb97e29152d71ba6b3cda7c65dc8d23cc4874e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 03:41:53 +0000 Subject: [PATCH 183/214] Update dependencies from https://github.com/dotnet/runtime build 20200830.6 (#13254) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 - System.Resources.Extensions: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6b15f20b244..38aa11891afa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 6b8ba50f2d9a..0d7cdecee5fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20427.5 3.1.0 - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20430.5 - 5.0.0-rc.1.20430.5 - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20430.5 - 5.0.0-rc.1.20430.5 - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20430.5 - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 From 33c7ac11a973a61ae1b4372d3ae1f7755199bfe2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 06:40:10 +0000 Subject: [PATCH 184/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200830.1 (#13257) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20430.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20430.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20430.2 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20430.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20430.1 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20430.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38aa11891afa..f000721365fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + https://github.com/dotnet/windowsdesktop - 126392251c4aa36a34224a842f29e5cbb28c0876 + 4f2e207f37ed38090110ae1635b1d83aba82dd30 - + https://github.com/dotnet/windowsdesktop - 126392251c4aa36a34224a842f29e5cbb28c0876 + 4f2e207f37ed38090110ae1635b1d83aba82dd30 - + https://github.com/dotnet/windowsdesktop - 126392251c4aa36a34224a842f29e5cbb28c0876 + 4f2e207f37ed38090110ae1635b1d83aba82dd30 - + https://github.com/dotnet/wpf - 5d292c5f6bfd9c64ac20816f42309213871a0ff4 + 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 - + https://github.com/dotnet/wpf - 5d292c5f6bfd9c64ac20816f42309213871a0ff4 + 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 - + https://github.com/dotnet/winforms - 6186819240e9556694415444e117e148ccf17a8b + 24c51e5fa491fe4b7690115225aa231f1fd7bdad https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0d7cdecee5fe..f7fbb11daa58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20430.1 - 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20430.1 From 9775d860e5a4767295d9323e82ed4e3cccfd2d70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 07:52:38 +0000 Subject: [PATCH 185/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200830.2 (#13256) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - dotnet-watch: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - dotnet-user-secrets: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - dotnet-dev-certs: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f000721365fd..ef367edbd451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 24c51e5fa491fe4b7690115225aa231f1fd7bdad - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e - + https://github.com/dotnet/aspnetcore - b4a198cfcdfb93a4b275d8a45b23a6bc01d9d8df + 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f7fbb11daa58..845c9b63dd54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 - 5.0.0-rc.1.20429.8 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.2 From 8c541703105866b253a6730601ca60d7cc9cd905 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 10:25:33 +0000 Subject: [PATCH 186/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200830.3 (#13261) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - dotnet-watch: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - dotnet-user-secrets: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - dotnet-dev-certs: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef367edbd451..815b9f44b134 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 24c51e5fa491fe4b7690115225aa231f1fd7bdad - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e - + https://github.com/dotnet/aspnetcore - 2bb34c3e4ea453a88398533ffdd94d50f83d2e1e + d3ebaf0782f79c2ea745102ba71901d5df7ada7e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 845c9b63dd54..0a8513a497ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20430.3 From 5f8d7c862ec39e939a5357b73608026f65949992 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 13:40:38 -0700 Subject: [PATCH 187/214] Update dependencies from https://github.com/dotnet/runtime build 20200831.5 (#13271) System.CodeDom , Microsoft.NET.HostModel , Microsoft.Extensions.DependencyModel , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Text.Encoding.CodePages , System.Resources.Extensions , System.Security.Cryptography.ProtectedData From Version 5.0.0-rc.1.20430.6 -> To Version 5.0.0-rc.1.20431.5 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 815b9f44b134..b7f93883878a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 0a8513a497ca..8e9558fc41ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20427.5 3.1.0 - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20430.6 - 5.0.0-rc.1.20430.6 - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20430.6 - 5.0.0-rc.1.20430.6 - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20430.6 - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 From 150a57e08c747eba5c0695b04ddf512d016eaabe Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 31 Aug 2020 15:51:23 -0700 Subject: [PATCH 188/214] Publish Installers And Checksums (#13280) --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 346fd082fcfb..5f26c7de9bea 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -168,6 +168,7 @@ stages: enableSigningValidation: false enableNugetValidation: false enableSourceLinkValidation: false + publishInstallersAndChecksums: true SDLValidationParameters: enable: false params: ' -SourceToolsList @("policheck","credscan") From c97ca58ffdd5d7aab98012467cd1a6958bffba59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 00:23:41 +0000 Subject: [PATCH 189/214] Update dependencies from https://github.com/dotnet/runtime build 20200831.7 (#13276) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - System.Resources.Extensions: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20431.5 to 5.0.0-rc.1.20431.7 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7f93883878a..60d463143faf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 https://github.com/dotnet/arcade f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 8e9558fc41ad..46f929f4bc1e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20427.5 3.1.0 - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.7 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20431.5 - 5.0.0-rc.1.20431.5 - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.7 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20431.5 - 5.0.0-rc.1.20431.5 - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.7 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20431.5 - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.7 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.7 From 4fca9bf06b7acd291ac83d832722febbdbb7daf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 02:23:52 +0000 Subject: [PATCH 190/214] Update dependencies from https://github.com/dotnet/templating build 20200831.3 (#13282) [release/5.0.1xx] Update dependencies from dotnet/templating - Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20431.3 - Microsoft.TemplateEngine.Cli: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20431.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60d463143faf..c94bafec093a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 5334768439d060fdbc97779bc687ecbe347dff3d + da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/templating - 5334768439d060fdbc97779bc687ecbe347dff3d + da62f3656cac0ac4bfb6b012bc072b3499f78e6c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 46f929f4bc1e..c240fe5d5348 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20431.3 $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) From 2889d0fca710639323c493f24a347e29246b7fb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 02:50:46 +0000 Subject: [PATCH 191/214] Update dependencies from https://github.com/dotnet/arcade build 20200831.1 (#13277) [release/5.0.1xx] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.XUnitExtensions: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Microsoft.DotNet.SignTool: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20427.5 to 5.0.0-beta.20431.1 --- eng/Version.Details.xml | 16 +- eng/Versions.props | 4 +- eng/common/build.ps1 | 2 + eng/common/build.sh | 9 +- .../dotnet-install-scripts/dotnet-install.ps1 | 774 +++++++++++ .../dotnet-install-scripts/dotnet-install.sh | 1133 +++++++++++++++++ .../templates/job/publish-build-assets.yml | 12 +- eng/common/templates/steps/publish-logs.yml | 29 +- eng/common/tools.ps1 | 71 +- eng/common/tools.sh | 37 +- global.json | 4 +- 11 files changed, 2013 insertions(+), 78 deletions(-) create mode 100644 eng/common/dotnet-install-scripts/dotnet-install.ps1 create mode 100644 eng/common/dotnet-install-scripts/dotnet-install.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c94bafec093a..69aa13711d47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://github.com/dotnet/runtime af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 - + https://github.com/dotnet/arcade - f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + 4be47e467013f8a07a1ed7b6e49e39c8150bde54 https://github.com/dotnet/runtime @@ -179,17 +179,17 @@ - + https://github.com/dotnet/arcade - f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + 4be47e467013f8a07a1ed7b6e49e39c8150bde54 - + https://github.com/dotnet/arcade - f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + 4be47e467013f8a07a1ed7b6e49e39c8150bde54 - + https://github.com/dotnet/arcade - f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 + 4be47e467013f8a07a1ed7b6e49e39c8150bde54 diff --git a/eng/Versions.props b/eng/Versions.props index c240fe5d5348..4d70e8cc5cea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 1.8.0 - 5.0.0-beta.20427.5 + 5.0.0-beta.20431.1 3.1.0 5.0.0-rc.1.20431.7 4.3.0 @@ -141,7 +141,7 @@ 4.19.2 4.19.0 - 5.0.0-beta.20427.5 + 5.0.0-beta.20431.1 .exe diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 94a91c0817e8..1fd7f686faea 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -7,6 +7,7 @@ Param( [string] $msbuildEngine = $null, [bool] $warnAsError = $true, [bool] $nodeReuse = $true, + [bool] $useDefaultDotnetInstall = $false, [switch][Alias('r')]$restore, [switch] $deployDeps, [switch][Alias('b')]$build, @@ -65,6 +66,7 @@ function Print-Usage() { Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build" Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -useDefaultDotnetInstall Use dotnet-install.* scripts from public location as opposed to from eng common folder" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." diff --git a/eng/common/build.sh b/eng/common/build.sh index 252b63604e6e..19849adbee3f 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -36,6 +36,8 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --useDefaultDotnetInstall Use dotnet-install.* scripts from public location as opposed to from eng common folder" + echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -78,6 +80,7 @@ prepare_machine=false verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' +use_default_dotnet_install=false properties='' while [[ $# > 0 ]]; do @@ -156,10 +159,14 @@ while [[ $# > 0 ]]; do runtime_source_feed=$2 shift ;; - -runtimesourcefeedkey) + -runtimesourcefeedkey) runtime_source_feed_key=$2 shift ;; + -usedefaultdotnetinstall) + use_default_dotnet_install=$2 + shift + ;; *) properties="$properties $1" ;; diff --git a/eng/common/dotnet-install-scripts/dotnet-install.ps1 b/eng/common/dotnet-install-scripts/dotnet-install.ps1 new file mode 100644 index 000000000000..f63b533f25a9 --- /dev/null +++ b/eng/common/dotnet-install-scripts/dotnet-install.ps1 @@ -0,0 +1,774 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Copied from https://dot.net/v1/dotnet-install.ps1 on 8/26/2020 + +<# +.SYNOPSIS + Installs dotnet cli +.DESCRIPTION + Installs dotnet cli. If dotnet installation already exists in the given directory + it will update it only if the requested version differs from the one already installed. +.PARAMETER Channel + Default: LTS + Download from the Channel specified. Possible values: + - Current - most current release + - LTS - most current supported release + - 2-part version in a format A.B - represents a specific release + examples: 2.0, 1.0 + - Branch name + examples: release/2.0.0, Master + Note: The version parameter overrides the channel parameter. +.PARAMETER Version + Default: latest + Represents a build version on specific channel. Possible values: + - latest - most latest build on specific channel + - coherent - most latest coherent build on specific channel + coherent applies only to SDK downloads + - 3-part version in a format A.B.C - represents specific version of build + examples: 2.0.0-preview2-006120, 1.1.0 +.PARAMETER InstallDir + Default: %LocalAppData%\Microsoft\dotnet + Path to where to install dotnet. Note that binaries will be placed directly in a given directory. +.PARAMETER Architecture + Default: - this value represents currently running OS architecture + Architecture of dotnet binaries to be installed. + Possible values are: , amd64, x64, x86, arm64, arm +.PARAMETER SharedRuntime + This parameter is obsolete and may be removed in a future version of this script. + The recommended alternative is '-Runtime dotnet'. + Installs just the shared runtime bits, not the entire SDK. +.PARAMETER Runtime + Installs just a shared runtime, not the entire SDK. + Possible values: + - dotnet - the Microsoft.NETCore.App shared runtime + - aspnetcore - the Microsoft.AspNetCore.App shared runtime + - windowsdesktop - the Microsoft.WindowsDesktop.App shared runtime +.PARAMETER DryRun + If set it will not perform installation but instead display what command line to use to consistently install + currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link + with specific version so that this command can be used deterministicly in a build script. + It also displays binaries location if you prefer to install or download it yourself. +.PARAMETER NoPath + By default this script will set environment variable PATH for the current process to the binaries folder inside installation folder. + If set it will display binaries location but not set any environment variable. +.PARAMETER Verbose + Displays diagnostics information. +.PARAMETER AzureFeed + Default: https://dotnetcli.azureedge.net/dotnet + This parameter typically is not changed by the user. + It allows changing the URL for the Azure feed used by this installer. +.PARAMETER UncachedFeed + This parameter typically is not changed by the user. + It allows changing the URL for the Uncached feed used by this installer. +.PARAMETER FeedCredential + Used as a query string to append to the Azure feed. + It allows changing the URL to use non-public blob storage accounts. +.PARAMETER ProxyAddress + If set, the installer will use the proxy when making web requests +.PARAMETER ProxyUseDefaultCredentials + Default: false + Use default credentials, when using proxy address. +.PARAMETER ProxyBypassList + If set with ProxyAddress, will provide the list of comma separated urls that will bypass the proxy +.PARAMETER SkipNonVersionedFiles + Default: false + Skips installing non-versioned files if they already exist, such as dotnet.exe. +.PARAMETER NoCdn + Disable downloading from the Azure CDN, and use the uncached feed directly. +.PARAMETER JSonFile + Determines the SDK version from a user specified global.json file + Note: global.json must have a value for 'SDK:Version' +#> +[cmdletbinding()] +param( + [string]$Channel="LTS", + [string]$Version="Latest", + [string]$JSonFile, + [string]$InstallDir="", + [string]$Architecture="", + [ValidateSet("dotnet", "aspnetcore", "windowsdesktop", IgnoreCase = $false)] + [string]$Runtime, + [Obsolete("This parameter may be removed in a future version of this script. The recommended alternative is '-Runtime dotnet'.")] + [switch]$SharedRuntime, + [switch]$DryRun, + [switch]$NoPath, + [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet", + [string]$UncachedFeed="https://dotnetcli.blob.core.windows.net/dotnet", + [string]$FeedCredential, + [string]$ProxyAddress, + [switch]$ProxyUseDefaultCredentials, + [string[]]$ProxyBypassList=@(), + [switch]$SkipNonVersionedFiles, + [switch]$NoCdn +) + +Set-StrictMode -Version Latest +$ErrorActionPreference="Stop" +$ProgressPreference="SilentlyContinue" + +if ($NoCdn) { + $AzureFeed = $UncachedFeed +} + +$BinFolderRelativePath="" + +if ($SharedRuntime -and (-not $Runtime)) { + $Runtime = "dotnet" +} + +# example path with regex: shared/1.0.0-beta-12345/somepath +$VersionRegEx="/\d+\.\d+[^/]+/" +$OverrideNonVersionedFiles = !$SkipNonVersionedFiles + +function Say($str) { + try + { + Write-Host "dotnet-install: $str" + } + catch + { + # Some platforms cannot utilize Write-Host (Azure Functions, for instance). Fall back to Write-Output + Write-Output "dotnet-install: $str" + } +} + +function Say-Verbose($str) { + try + { + Write-Verbose "dotnet-install: $str" + } + catch + { + # Some platforms cannot utilize Write-Verbose (Azure Functions, for instance). Fall back to Write-Output + Write-Output "dotnet-install: $str" + } +} + +function Say-Invocation($Invocation) { + $command = $Invocation.MyCommand; + $args = (($Invocation.BoundParameters.Keys | foreach { "-$_ `"$($Invocation.BoundParameters[$_])`"" }) -join " ") + Say-Verbose "$command $args" +} + +function Invoke-With-Retry([ScriptBlock]$ScriptBlock, [int]$MaxAttempts = 3, [int]$SecondsBetweenAttempts = 1) { + $Attempts = 0 + + while ($true) { + try { + return $ScriptBlock.Invoke() + } + catch { + $Attempts++ + if ($Attempts -lt $MaxAttempts) { + Start-Sleep $SecondsBetweenAttempts + } + else { + throw + } + } + } +} + +function Get-Machine-Architecture() { + Say-Invocation $MyInvocation + + # On PS x86, PROCESSOR_ARCHITECTURE reports x86 even on x64 systems. + # To get the correct architecture, we need to use PROCESSOR_ARCHITEW6432. + # PS x64 doesn't define this, so we fall back to PROCESSOR_ARCHITECTURE. + # Possible values: amd64, x64, x86, arm64, arm + + if( $ENV:PROCESSOR_ARCHITEW6432 -ne $null ) + { + return $ENV:PROCESSOR_ARCHITEW6432 + } + + return $ENV:PROCESSOR_ARCHITECTURE +} + +function Get-CLIArchitecture-From-Architecture([string]$Architecture) { + Say-Invocation $MyInvocation + + switch ($Architecture.ToLower()) { + { $_ -eq "" } { return Get-CLIArchitecture-From-Architecture $(Get-Machine-Architecture) } + { ($_ -eq "amd64") -or ($_ -eq "x64") } { return "x64" } + { $_ -eq "x86" } { return "x86" } + { $_ -eq "arm" } { return "arm" } + { $_ -eq "arm64" } { return "arm64" } + default { throw "Architecture not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues" } + } +} + +# The version text returned from the feeds is a 1-line or 2-line string: +# For the SDK and the dotnet runtime (2 lines): +# Line 1: # commit_hash +# Line 2: # 4-part version +# For the aspnetcore runtime (1 line): +# Line 1: # 4-part version +function Get-Version-Info-From-Version-Text([string]$VersionText) { + Say-Invocation $MyInvocation + + $Data = -split $VersionText + + $VersionInfo = @{ + CommitHash = $(if ($Data.Count -gt 1) { $Data[0] }) + Version = $Data[-1] # last line is always the version number. + } + return $VersionInfo +} + +function Load-Assembly([string] $Assembly) { + try { + Add-Type -Assembly $Assembly | Out-Null + } + catch { + # On Nano Server, Powershell Core Edition is used. Add-Type is unable to resolve base class assemblies because they are not GAC'd. + # Loading the base class assemblies is not unnecessary as the types will automatically get resolved. + } +} + +function GetHTTPResponse([Uri] $Uri) +{ + Invoke-With-Retry( + { + + $HttpClient = $null + + try { + # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet. + Load-Assembly -Assembly System.Net.Http + + if(-not $ProxyAddress) { + try { + # Despite no proxy being explicitly specified, we may still be behind a default proxy + $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy; + if($DefaultProxy -and (-not $DefaultProxy.IsBypassed($Uri))) { + $ProxyAddress = $DefaultProxy.GetProxy($Uri).OriginalString + $ProxyUseDefaultCredentials = $true + } + } catch { + # Eat the exception and move forward as the above code is an attempt + # at resolving the DefaultProxy that may not have been a problem. + $ProxyAddress = $null + Say-Verbose("Exception ignored: $_.Exception.Message - moving forward...") + } + } + + if($ProxyAddress) { + $HttpClientHandler = New-Object System.Net.Http.HttpClientHandler + $HttpClientHandler.Proxy = New-Object System.Net.WebProxy -Property @{ + Address=$ProxyAddress; + UseDefaultCredentials=$ProxyUseDefaultCredentials; + BypassList = $ProxyBypassList; + } + $HttpClient = New-Object System.Net.Http.HttpClient -ArgumentList $HttpClientHandler + } + else { + + $HttpClient = New-Object System.Net.Http.HttpClient + } + # Default timeout for HttpClient is 100s. For a 50 MB download this assumes 500 KB/s average, any less will time out + # 20 minutes allows it to work over much slower connections. + $HttpClient.Timeout = New-TimeSpan -Minutes 20 + $Response = $HttpClient.GetAsync("${Uri}${FeedCredential}").Result + if (($Response -eq $null) -or (-not ($Response.IsSuccessStatusCode))) { + # The feed credential is potentially sensitive info. Do not log FeedCredential to console output. + $ErrorMsg = "Failed to download $Uri." + if ($Response -ne $null) { + $ErrorMsg += " $Response" + } + + throw $ErrorMsg + } + + return $Response + } + finally { + if ($HttpClient -ne $null) { + $HttpClient.Dispose() + } + } + }) +} + +function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Coherent) { + Say-Invocation $MyInvocation + + $VersionFileUrl = $null + if ($Runtime -eq "dotnet") { + $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version" + } + elseif ($Runtime -eq "aspnetcore") { + $VersionFileUrl = "$UncachedFeed/aspnetcore/Runtime/$Channel/latest.version" + } + # Currently, the WindowsDesktop runtime is manufactured with the .Net core runtime + elseif ($Runtime -eq "windowsdesktop") { + $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version" + } + elseif (-not $Runtime) { + if ($Coherent) { + $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.coherent.version" + } + else { + $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.version" + } + } + else { + throw "Invalid value for `$Runtime" + } + try { + $Response = GetHTTPResponse -Uri $VersionFileUrl + } + catch { + throw "Could not resolve version information." + } + $StringContent = $Response.Content.ReadAsStringAsync().Result + + switch ($Response.Content.Headers.ContentType) { + { ($_ -eq "application/octet-stream") } { $VersionText = $StringContent } + { ($_ -eq "text/plain") } { $VersionText = $StringContent } + { ($_ -eq "text/plain; charset=UTF-8") } { $VersionText = $StringContent } + default { throw "``$Response.Content.Headers.ContentType`` is an unknown .version file content type." } + } + + $VersionInfo = Get-Version-Info-From-Version-Text $VersionText + + return $VersionInfo +} + +function Parse-Jsonfile-For-Version([string]$JSonFile) { + Say-Invocation $MyInvocation + + If (-Not (Test-Path $JSonFile)) { + throw "Unable to find '$JSonFile'" + } + try { + $JSonContent = Get-Content($JSonFile) -Raw | ConvertFrom-Json | Select-Object -expand "sdk" -ErrorAction SilentlyContinue + } + catch { + throw "Json file unreadable: '$JSonFile'" + } + if ($JSonContent) { + try { + $JSonContent.PSObject.Properties | ForEach-Object { + $PropertyName = $_.Name + if ($PropertyName -eq "version") { + $Version = $_.Value + Say-Verbose "Version = $Version" + } + } + } + catch { + throw "Unable to parse the SDK node in '$JSonFile'" + } + } + else { + throw "Unable to find the SDK node in '$JSonFile'" + } + If ($Version -eq $null) { + throw "Unable to find the SDK:version node in '$JSonFile'" + } + return $Version +} + +function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel, [string]$Version, [string]$JSonFile) { + Say-Invocation $MyInvocation + + if (-not $JSonFile) { + switch ($Version.ToLower()) { + { $_ -eq "latest" } { + $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $False + return $LatestVersionInfo.Version + } + { $_ -eq "coherent" } { + $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $True + return $LatestVersionInfo.Version + } + default { return $Version } + } + } + else { + return Parse-Jsonfile-For-Version $JSonFile + } +} + +function Get-Download-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) { + Say-Invocation $MyInvocation + + # If anything fails in this lookup it will default to $SpecificVersion + $SpecificProductVersion = Get-Product-Version -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion + + if ($Runtime -eq "dotnet") { + $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" + } + elseif ($Runtime -eq "aspnetcore") { + $PayloadURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/aspnetcore-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" + } + elseif ($Runtime -eq "windowsdesktop") { + $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/windowsdesktop-runtime-$SpecificProductVersion-win-$CLIArchitecture.zip" + } + elseif (-not $Runtime) { + $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-sdk-$SpecificProductVersion-win-$CLIArchitecture.zip" + } + else { + throw "Invalid value for `$Runtime" + } + + Say-Verbose "Constructed primary named payload URL: $PayloadURL" + + return $PayloadURL, $SpecificProductVersion +} + +function Get-LegacyDownload-Link([string]$AzureFeed, [string]$SpecificVersion, [string]$CLIArchitecture) { + Say-Invocation $MyInvocation + + if (-not $Runtime) { + $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-win-$CLIArchitecture.$SpecificVersion.zip" + } + elseif ($Runtime -eq "dotnet") { + $PayloadURL = "$AzureFeed/Runtime/$SpecificVersion/dotnet-win-$CLIArchitecture.$SpecificVersion.zip" + } + else { + return $null + } + + Say-Verbose "Constructed legacy named payload URL: $PayloadURL" + + return $PayloadURL +} + +function Get-Product-Version([string]$AzureFeed, [string]$SpecificVersion) { + Say-Invocation $MyInvocation + + if ($Runtime -eq "dotnet") { + $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/productVersion.txt" + } + elseif ($Runtime -eq "aspnetcore") { + $ProductVersionTxtURL = "$AzureFeed/aspnetcore/Runtime/$SpecificVersion/productVersion.txt" + } + elseif ($Runtime -eq "windowsdesktop") { + $ProductVersionTxtURL = "$AzureFeed/Runtime/$SpecificVersion/productVersion.txt" + } + elseif (-not $Runtime) { + $ProductVersionTxtURL = "$AzureFeed/Sdk/$SpecificVersion/productVersion.txt" + } + else { + throw "Invalid value specified for `$Runtime" + } + + Say-Verbose "Checking for existence of $ProductVersionTxtURL" + + try { + $productVersionResponse = GetHTTPResponse($productVersionTxtUrl) + + if ($productVersionResponse.StatusCode -eq 200) { + $productVersion = $productVersionResponse.Content.ReadAsStringAsync().Result.Trim() + if ($productVersion -ne $SpecificVersion) + { + Say "Using alternate version $productVersion found in $ProductVersionTxtURL" + } + + return $productVersion + } + else { + Say-Verbose "Got StatusCode $($productVersionResponse.StatusCode) trying to get productVersion.txt at $productVersionTxtUrl, so using default value of $SpecificVersion" + $productVersion = $SpecificVersion + } + } catch { + Say-Verbose "Could not read productVersion.txt at $productVersionTxtUrl, so using default value of $SpecificVersion" + $productVersion = $SpecificVersion + } + + return $productVersion +} + +function Get-User-Share-Path() { + Say-Invocation $MyInvocation + + $InstallRoot = $env:DOTNET_INSTALL_DIR + if (!$InstallRoot) { + $InstallRoot = "$env:LocalAppData\Microsoft\dotnet" + } + return $InstallRoot +} + +function Resolve-Installation-Path([string]$InstallDir) { + Say-Invocation $MyInvocation + + if ($InstallDir -eq "") { + return Get-User-Share-Path + } + return $InstallDir +} + +function Is-Dotnet-Package-Installed([string]$InstallRoot, [string]$RelativePathToPackage, [string]$SpecificVersion) { + Say-Invocation $MyInvocation + + $DotnetPackagePath = Join-Path -Path $InstallRoot -ChildPath $RelativePathToPackage | Join-Path -ChildPath $SpecificVersion + Say-Verbose "Is-Dotnet-Package-Installed: DotnetPackagePath=$DotnetPackagePath" + return Test-Path $DotnetPackagePath -PathType Container +} + +function Get-Absolute-Path([string]$RelativeOrAbsolutePath) { + # Too much spam + # Say-Invocation $MyInvocation + + return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($RelativeOrAbsolutePath) +} + +function Get-Path-Prefix-With-Version($path) { + $match = [regex]::match($path, $VersionRegEx) + if ($match.Success) { + return $entry.FullName.Substring(0, $match.Index + $match.Length) + } + + return $null +} + +function Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package([System.IO.Compression.ZipArchive]$Zip, [string]$OutPath) { + Say-Invocation $MyInvocation + + $ret = @() + foreach ($entry in $Zip.Entries) { + $dir = Get-Path-Prefix-With-Version $entry.FullName + if ($dir -ne $null) { + $path = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $dir) + if (-Not (Test-Path $path -PathType Container)) { + $ret += $dir + } + } + } + + $ret = $ret | Sort-Object | Get-Unique + + $values = ($ret | foreach { "$_" }) -join ";" + Say-Verbose "Directories to unpack: $values" + + return $ret +} + +# Example zip content and extraction algorithm: +# Rule: files if extracted are always being extracted to the same relative path locally +# .\ +# a.exe # file does not exist locally, extract +# b.dll # file exists locally, override only if $OverrideFiles set +# aaa\ # same rules as for files +# ... +# abc\1.0.0\ # directory contains version and exists locally +# ... # do not extract content under versioned part +# abc\asd\ # same rules as for files +# ... +# def\ghi\1.0.1\ # directory contains version and does not exist locally +# ... # extract content +function Extract-Dotnet-Package([string]$ZipPath, [string]$OutPath) { + Say-Invocation $MyInvocation + + Load-Assembly -Assembly System.IO.Compression.FileSystem + Set-Variable -Name Zip + try { + $Zip = [System.IO.Compression.ZipFile]::OpenRead($ZipPath) + + $DirectoriesToUnpack = Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package -Zip $Zip -OutPath $OutPath + + foreach ($entry in $Zip.Entries) { + $PathWithVersion = Get-Path-Prefix-With-Version $entry.FullName + if (($PathWithVersion -eq $null) -Or ($DirectoriesToUnpack -contains $PathWithVersion)) { + $DestinationPath = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $entry.FullName) + $DestinationDir = Split-Path -Parent $DestinationPath + $OverrideFiles=$OverrideNonVersionedFiles -Or (-Not (Test-Path $DestinationPath)) + if ((-Not $DestinationPath.EndsWith("\")) -And $OverrideFiles) { + New-Item -ItemType Directory -Force -Path $DestinationDir | Out-Null + [System.IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $DestinationPath, $OverrideNonVersionedFiles) + } + } + } + } + finally { + if ($Zip -ne $null) { + $Zip.Dispose() + } + } +} + +function DownloadFile($Source, [string]$OutPath) { + if ($Source -notlike "http*") { + # Using System.IO.Path.GetFullPath to get the current directory + # does not work in this context - $pwd gives the current directory + if (![System.IO.Path]::IsPathRooted($Source)) { + $Source = $(Join-Path -Path $pwd -ChildPath $Source) + } + $Source = Get-Absolute-Path $Source + Say "Copying file from $Source to $OutPath" + Copy-Item $Source $OutPath + return + } + + $Stream = $null + + try { + $Response = GetHTTPResponse -Uri $Source + $Stream = $Response.Content.ReadAsStreamAsync().Result + $File = [System.IO.File]::Create($OutPath) + $Stream.CopyTo($File) + $File.Close() + } + finally { + if ($Stream -ne $null) { + $Stream.Dispose() + } + } +} + +function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot, [string]$BinFolderRelativePath) { + $BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath $BinFolderRelativePath) + if (-Not $NoPath) { + $SuffixedBinPath = "$BinPath;" + if (-Not $env:path.Contains($SuffixedBinPath)) { + Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process." + $env:path = $SuffixedBinPath + $env:path + } else { + Say-Verbose "Current process PATH already contains `"$BinPath`"" + } + } + else { + Say "Binaries of dotnet can be found in $BinPath" + } +} + +$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture +$SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $AzureFeed -Channel $Channel -Version $Version -JSonFile $JSonFile +$DownloadLink, $EffectiveVersion = Get-Download-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture +$LegacyDownloadLink = Get-LegacyDownload-Link -AzureFeed $AzureFeed -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture + +$InstallRoot = Resolve-Installation-Path $InstallDir +Say-Verbose "InstallRoot: $InstallRoot" +$ScriptName = $MyInvocation.MyCommand.Name + +if ($DryRun) { + Say "Payload URLs:" + Say "Primary named payload URL: $DownloadLink" + if ($LegacyDownloadLink) { + Say "Legacy named payload URL: $LegacyDownloadLink" + } + $RepeatableCommand = ".\$ScriptName -Version `"$SpecificVersion`" -InstallDir `"$InstallRoot`" -Architecture `"$CLIArchitecture`"" + if ($Runtime -eq "dotnet") { + $RepeatableCommand+=" -Runtime `"dotnet`"" + } + elseif ($Runtime -eq "aspnetcore") { + $RepeatableCommand+=" -Runtime `"aspnetcore`"" + } + foreach ($key in $MyInvocation.BoundParameters.Keys) { + if (-not (@("Architecture","Channel","DryRun","InstallDir","Runtime","SharedRuntime","Version") -contains $key)) { + $RepeatableCommand+=" -$key `"$($MyInvocation.BoundParameters[$key])`"" + } + } + Say "Repeatable invocation: $RepeatableCommand" + exit 0 +} + +if ($Runtime -eq "dotnet") { + $assetName = ".NET Core Runtime" + $dotnetPackageRelativePath = "shared\Microsoft.NETCore.App" +} +elseif ($Runtime -eq "aspnetcore") { + $assetName = "ASP.NET Core Runtime" + $dotnetPackageRelativePath = "shared\Microsoft.AspNetCore.App" +} +elseif ($Runtime -eq "windowsdesktop") { + $assetName = ".NET Core Windows Desktop Runtime" + $dotnetPackageRelativePath = "shared\Microsoft.WindowsDesktop.App" +} +elseif (-not $Runtime) { + $assetName = ".NET Core SDK" + $dotnetPackageRelativePath = "sdk" +} +else { + throw "Invalid value for `$Runtime" +} + +if ($SpecificVersion -ne $EffectiveVersion) +{ + Say "Performing installation checks for effective version: $EffectiveVersion" + $SpecificVersion = $EffectiveVersion +} + +# Check if the SDK version is already installed. +$isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion +if ($isAssetInstalled) { + Say "$assetName version $SpecificVersion is already installed." + Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath + exit 0 +} + +New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null + +$installDrive = $((Get-Item $InstallRoot).PSDrive.Name); +$diskInfo = Get-PSDrive -Name $installDrive +if ($diskInfo.Free / 1MB -le 100) { + Say "There is not enough disk space on drive ${installDrive}:" + exit 0 +} + +$ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) +Say-Verbose "Zip path: $ZipPath" + +$DownloadFailed = $false +Say "Downloading link: $DownloadLink" +try { + DownloadFile -Source $DownloadLink -OutPath $ZipPath +} +catch { + Say "Cannot download: $DownloadLink" + if ($LegacyDownloadLink) { + $DownloadLink = $LegacyDownloadLink + $ZipPath = [System.IO.Path]::combine([System.IO.Path]::GetTempPath(), [System.IO.Path]::GetRandomFileName()) + Say-Verbose "Legacy zip path: $ZipPath" + Say "Downloading legacy link: $DownloadLink" + try { + DownloadFile -Source $DownloadLink -OutPath $ZipPath + } + catch { + Say "Cannot download: $DownloadLink" + $DownloadFailed = $true + } + } + else { + $DownloadFailed = $true + } +} + +if ($DownloadFailed) { + throw "Could not find/download: `"$assetName`" with version = $SpecificVersion`nRefer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support" +} + +Say "Extracting zip from $DownloadLink" +Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot + +# Check if the SDK version is installed; if not, fail the installation. +$isAssetInstalled = $false + +# if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed. +if ($SpecificVersion -Match "rtm" -or $SpecificVersion -Match "servicing") { + $ReleaseVersion = $SpecificVersion.Split("-")[0] + Say-Verbose "Checking installation: version = $ReleaseVersion" + $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $ReleaseVersion +} + +# Check if the SDK version is installed. +if (!$isAssetInstalled) { + Say-Verbose "Checking installation: version = $SpecificVersion" + $isAssetInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $SpecificVersion +} + +if (!$isAssetInstalled) { + throw "`"$assetName`" with version = $SpecificVersion failed to install with an unknown error." +} + +Remove-Item $ZipPath + +Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath + +Say "Installation finished" +exit 0 \ No newline at end of file diff --git a/eng/common/dotnet-install-scripts/dotnet-install.sh b/eng/common/dotnet-install-scripts/dotnet-install.sh new file mode 100644 index 000000000000..92161141f6c3 --- /dev/null +++ b/eng/common/dotnet-install-scripts/dotnet-install.sh @@ -0,0 +1,1133 @@ +#!/usr/bin/env bash +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Stop script on NZEC +set -e +# Stop script if unbound variable found (use ${var:-} if intentional) +set -u +# By default cmd1 | cmd2 returns exit code of cmd2 regardless of cmd1 success +# This is causing it to fail +set -o pipefail + +# Use in the the functions: eval $invocation +invocation='say_verbose "Calling: ${yellow:-}${FUNCNAME[0]} ${green:-}$*${normal:-}"' + +# standard output may be used as a return value in the functions +# we need a way to write text on the screen in the functions so that +# it won't interfere with the return value. +# Exposing stream 3 as a pipe to standard output of the script itself +exec 3>&1 + +# Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. +# See if stdout is a terminal +if [ -t 1 ] && command -v tput > /dev/null; then + # see if it supports colors + ncolors=$(tput colors) + if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then + bold="$(tput bold || echo)" + normal="$(tput sgr0 || echo)" + black="$(tput setaf 0 || echo)" + red="$(tput setaf 1 || echo)" + green="$(tput setaf 2 || echo)" + yellow="$(tput setaf 3 || echo)" + blue="$(tput setaf 4 || echo)" + magenta="$(tput setaf 5 || echo)" + cyan="$(tput setaf 6 || echo)" + white="$(tput setaf 7 || echo)" + fi +fi + +say_warning() { + printf "%b\n" "${yellow:-}dotnet_install: Warning: $1${normal:-}" +} + +say_err() { + printf "%b\n" "${red:-}dotnet_install: Error: $1${normal:-}" >&2 +} + +say() { + # using stream 3 (defined in the beginning) to not interfere with stdout of functions + # which may be used as return value + printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3 +} + +say_verbose() { + if [ "$verbose" = true ]; then + say "$1" + fi +} + +# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets, +# then and only then should the Linux distribution appear in this list. +# Adding a Linux distribution to this list does not imply distribution-specific support. +get_legacy_os_name_from_platform() { + eval $invocation + + platform="$1" + case "$platform" in + "centos.7") + echo "centos" + return 0 + ;; + "debian.8") + echo "debian" + return 0 + ;; + "debian.9") + echo "debian.9" + return 0 + ;; + "fedora.23") + echo "fedora.23" + return 0 + ;; + "fedora.24") + echo "fedora.24" + return 0 + ;; + "fedora.27") + echo "fedora.27" + return 0 + ;; + "fedora.28") + echo "fedora.28" + return 0 + ;; + "opensuse.13.2") + echo "opensuse.13.2" + return 0 + ;; + "opensuse.42.1") + echo "opensuse.42.1" + return 0 + ;; + "opensuse.42.3") + echo "opensuse.42.3" + return 0 + ;; + "rhel.7"*) + echo "rhel" + return 0 + ;; + "ubuntu.14.04") + echo "ubuntu" + return 0 + ;; + "ubuntu.16.04") + echo "ubuntu.16.04" + return 0 + ;; + "ubuntu.16.10") + echo "ubuntu.16.10" + return 0 + ;; + "ubuntu.18.04") + echo "ubuntu.18.04" + return 0 + ;; + "alpine.3.4.3") + echo "alpine" + return 0 + ;; + esac + return 1 +} + +get_linux_platform_name() { + eval $invocation + + if [ -n "$runtime_id" ]; then + echo "${runtime_id%-*}" + return 0 + else + if [ -e /etc/os-release ]; then + . /etc/os-release + echo "$ID${VERSION_ID:+.${VERSION_ID}}" + return 0 + elif [ -e /etc/redhat-release ]; then + local redhatRelease=$(&1 || true) | grep -q musl +} + +get_current_os_name() { + eval $invocation + + local uname=$(uname) + if [ "$uname" = "Darwin" ]; then + echo "osx" + return 0 + elif [ "$uname" = "FreeBSD" ]; then + echo "freebsd" + return 0 + elif [ "$uname" = "Linux" ]; then + local linux_platform_name + linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; } + + if [ "$linux_platform_name" = "rhel.6" ]; then + echo $linux_platform_name + return 0 + elif is_musl_based_distro; then + echo "linux-musl" + return 0 + else + echo "linux" + return 0 + fi + fi + + say_err "OS name could not be detected: UName = $uname" + return 1 +} + +get_legacy_os_name() { + eval $invocation + + local uname=$(uname) + if [ "$uname" = "Darwin" ]; then + echo "osx" + return 0 + elif [ -n "$runtime_id" ]; then + echo $(get_legacy_os_name_from_platform "${runtime_id%-*}" || echo "${runtime_id%-*}") + return 0 + else + if [ -e /etc/os-release ]; then + . /etc/os-release + os=$(get_legacy_os_name_from_platform "$ID${VERSION_ID:+.${VERSION_ID}}" || echo "") + if [ -n "$os" ]; then + echo "$os" + return 0 + fi + fi + fi + + say_verbose "Distribution specific OS name and version could not be detected: UName = $uname" + return 1 +} + +machine_has() { + eval $invocation + + hash "$1" > /dev/null 2>&1 + return $? +} + + +check_min_reqs() { + local hasMinimum=false + if machine_has "curl"; then + hasMinimum=true + elif machine_has "wget"; then + hasMinimum=true + fi + + if [ "$hasMinimum" = "false" ]; then + say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed." + return 1 + fi + return 0 +} + +check_pre_reqs() { + eval $invocation + + if [ "${DOTNET_INSTALL_SKIP_PREREQS:-}" = "1" ]; then + return 0 + fi + + if [ "$(uname)" = "Linux" ]; then + if is_musl_based_distro; then + if ! command -v scanelf > /dev/null; then + say_warning "scanelf not found, please install pax-utils package." + return 0 + fi + LDCONFIG_COMMAND="scanelf --ldpath -BF '%f'" + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libintl)" ] && say_warning "Unable to locate libintl. Probable prerequisite missing; install libintl (or gettext)." + else + if [ ! -x "$(command -v ldconfig)" ]; then + say_verbose "ldconfig is not in PATH, trying /sbin/ldconfig." + LDCONFIG_COMMAND="/sbin/ldconfig" + else + LDCONFIG_COMMAND="ldconfig" + fi + local librarypath=${LD_LIBRARY_PATH:-} + LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }" + fi + + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep zlib)" ] && say_warning "Unable to locate zlib. Probable prerequisite missing; install zlib." + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep ssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; install libssl." + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_warning "Unable to locate libicu. Probable prerequisite missing; install libicu." + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep lttng)" ] && say_warning "Unable to locate liblttng. Probable prerequisite missing; install libcurl." + [ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libcurl)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; install libcurl." + fi + + return 0 +} + +# args: +# input - $1 +to_lowercase() { + #eval $invocation + + echo "$1" | tr '[:upper:]' '[:lower:]' + return 0 +} + +# args: +# input - $1 +remove_trailing_slash() { + #eval $invocation + + local input="${1:-}" + echo "${input%/}" + return 0 +} + +# args: +# input - $1 +remove_beginning_slash() { + #eval $invocation + + local input="${1:-}" + echo "${input#/}" + return 0 +} + +# args: +# root_path - $1 +# child_path - $2 - this parameter can be empty +combine_paths() { + eval $invocation + + # TODO: Consider making it work with any number of paths. For now: + if [ ! -z "${3:-}" ]; then + say_err "combine_paths: Function takes two parameters." + return 1 + fi + + local root_path="$(remove_trailing_slash "$1")" + local child_path="$(remove_beginning_slash "${2:-}")" + say_verbose "combine_paths: root_path=$root_path" + say_verbose "combine_paths: child_path=$child_path" + echo "$root_path/$child_path" + return 0 +} + +get_machine_architecture() { + eval $invocation + + if command -v uname > /dev/null; then + CPUName=$(uname -m) + case $CPUName in + armv7l) + echo "arm" + return 0 + ;; + aarch64) + echo "arm64" + return 0 + ;; + esac + fi + + # Always default to 'x64' + echo "x64" + return 0 +} + +# args: +# architecture - $1 +get_normalized_architecture_from_architecture() { + eval $invocation + + local architecture="$(to_lowercase "$1")" + case "$architecture" in + \) + echo "$(get_normalized_architecture_from_architecture "$(get_machine_architecture)")" + return 0 + ;; + amd64|x64) + echo "x64" + return 0 + ;; + arm) + echo "arm" + return 0 + ;; + arm64) + echo "arm64" + return 0 + ;; + esac + + say_err "Architecture \`$architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/sdk/issues" + return 1 +} + +# The version text returned from the feeds is a 1-line or 2-line string: +# For the SDK and the dotnet runtime (2 lines): +# Line 1: # commit_hash +# Line 2: # 4-part version +# For the aspnetcore runtime (1 line): +# Line 1: # 4-part version + +# args: +# version_text - stdin +get_version_from_version_info() { + eval $invocation + + cat | tail -n 1 | sed 's/\r$//' + return 0 +} + +# args: +# install_root - $1 +# relative_path_to_package - $2 +# specific_version - $3 +is_dotnet_package_installed() { + eval $invocation + + local install_root="$1" + local relative_path_to_package="$2" + local specific_version="${3//[$'\t\r\n']}" + + local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")" + say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path" + + if [ -d "$dotnet_package_path" ]; then + return 0 + else + return 1 + fi +} + +# args: +# azure_feed - $1 +# channel - $2 +# normalized_architecture - $3 +# coherent - $4 +get_latest_version_info() { + eval $invocation + + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local coherent="$4" + + local version_file_url=null + if [[ "$runtime" == "dotnet" ]]; then + version_file_url="$uncached_feed/Runtime/$channel/latest.version" + elif [[ "$runtime" == "aspnetcore" ]]; then + version_file_url="$uncached_feed/aspnetcore/Runtime/$channel/latest.version" + elif [ -z "$runtime" ]; then + if [ "$coherent" = true ]; then + version_file_url="$uncached_feed/Sdk/$channel/latest.coherent.version" + else + version_file_url="$uncached_feed/Sdk/$channel/latest.version" + fi + else + say_err "Invalid value for \$runtime" + return 1 + fi + say_verbose "get_latest_version_info: latest url: $version_file_url" + + download "$version_file_url" + return $? +} + +# args: +# json_file - $1 +parse_jsonfile_for_version() { + eval $invocation + + local json_file="$1" + if [ ! -f "$json_file" ]; then + say_err "Unable to find \`$json_file\`" + return 1 + fi + + sdk_section=$(cat $json_file | awk '/"sdk"/,/}/') + if [ -z "$sdk_section" ]; then + say_err "Unable to parse the SDK node in \`$json_file\`" + return 1 + fi + + sdk_list=$(echo $sdk_section | awk -F"[{}]" '{print $2}') + sdk_list=${sdk_list//[\" ]/} + sdk_list=${sdk_list//,/$'\n'} + sdk_list="$(echo -e "${sdk_list}" | tr -d '[[:space:]]')" + + local version_info="" + while read -r line; do + IFS=: + while read -r key value; do + if [[ "$key" == "version" ]]; then + version_info=$value + fi + done <<< "$line" + done <<< "$sdk_list" + if [ -z "$version_info" ]; then + say_err "Unable to find the SDK:version node in \`$json_file\`" + return 1 + fi + + unset IFS; + echo "$version_info" + return 0 +} + +# args: +# azure_feed - $1 +# channel - $2 +# normalized_architecture - $3 +# version - $4 +# json_file - $5 +get_specific_version_from_version() { + eval $invocation + + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local version="$(to_lowercase "$4")" + local json_file="$5" + + if [ -z "$json_file" ]; then + case "$version" in + latest) + local version_info + version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1 + say_verbose "get_specific_version_from_version: version_info=$version_info" + echo "$version_info" | get_version_from_version_info + return 0 + ;; + coherent) + local version_info + version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" true)" || return 1 + say_verbose "get_specific_version_from_version: version_info=$version_info" + echo "$version_info" | get_version_from_version_info + return 0 + ;; + *) + echo "$version" + return 0 + ;; + esac + else + local version_info + version_info="$(parse_jsonfile_for_version "$json_file")" || return 1 + echo "$version_info" + return 0 + fi +} + +# args: +# azure_feed - $1 +# channel - $2 +# normalized_architecture - $3 +# specific_version - $4 +construct_download_link() { + eval $invocation + + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local specific_version="${4//[$'\t\r\n']}" + local specific_product_version="$(get_specific_product_version "$1" "$4")" + + local osname + osname="$(get_current_os_name)" || return 1 + + local download_link=null + if [[ "$runtime" == "dotnet" ]]; then + download_link="$azure_feed/Runtime/$specific_version/dotnet-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz" + elif [[ "$runtime" == "aspnetcore" ]]; then + download_link="$azure_feed/aspnetcore/Runtime/$specific_version/aspnetcore-runtime-$specific_product_version-$osname-$normalized_architecture.tar.gz" + elif [ -z "$runtime" ]; then + download_link="$azure_feed/Sdk/$specific_version/dotnet-sdk-$specific_product_version-$osname-$normalized_architecture.tar.gz" + else + return 1 + fi + + echo "$download_link" + return 0 +} + +# args: +# azure_feed - $1 +# specific_version - $2 +get_specific_product_version() { + # If we find a 'productVersion.txt' at the root of any folder, we'll use its contents + # to resolve the version of what's in the folder, superseding the specified version. + eval $invocation + + local azure_feed="$1" + local specific_version="${2//[$'\t\r\n']}" + local specific_product_version=$specific_version + + local download_link=null + if [[ "$runtime" == "dotnet" ]]; then + download_link="$azure_feed/Runtime/$specific_version/productVersion.txt${feed_credential}" + elif [[ "$runtime" == "aspnetcore" ]]; then + download_link="$azure_feed/aspnetcore/Runtime/$specific_version/productVersion.txt${feed_credential}" + elif [ -z "$runtime" ]; then + download_link="$azure_feed/Sdk/$specific_version/productVersion.txt${feed_credential}" + else + return 1 + fi + + specific_product_version=$(curl -s --fail "$download_link") + if [ $? -ne 0 ] + then + specific_product_version=$(wget -qO- "$download_link") + if [ $? -ne 0 ] + then + specific_product_version=$specific_version + fi + fi + specific_product_version="${specific_product_version//[$'\t\r\n']}" + + echo "$specific_product_version" + return 0 +} + +# args: +# azure_feed - $1 +# channel - $2 +# normalized_architecture - $3 +# specific_version - $4 +construct_legacy_download_link() { + eval $invocation + + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local specific_version="${4//[$'\t\r\n']}" + + local distro_specific_osname + distro_specific_osname="$(get_legacy_os_name)" || return 1 + + local legacy_download_link=null + if [[ "$runtime" == "dotnet" ]]; then + legacy_download_link="$azure_feed/Runtime/$specific_version/dotnet-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz" + elif [ -z "$runtime" ]; then + legacy_download_link="$azure_feed/Sdk/$specific_version/dotnet-dev-$distro_specific_osname-$normalized_architecture.$specific_version.tar.gz" + else + return 1 + fi + + echo "$legacy_download_link" + return 0 +} + +get_user_install_path() { + eval $invocation + + if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then + echo "$DOTNET_INSTALL_DIR" + else + echo "$HOME/.dotnet" + fi + return 0 +} + +# args: +# install_dir - $1 +resolve_installation_path() { + eval $invocation + + local install_dir=$1 + if [ "$install_dir" = "" ]; then + local user_install_path="$(get_user_install_path)" + say_verbose "resolve_installation_path: user_install_path=$user_install_path" + echo "$user_install_path" + return 0 + fi + + echo "$install_dir" + return 0 +} + +# args: +# relative_or_absolute_path - $1 +get_absolute_path() { + eval $invocation + + local relative_or_absolute_path=$1 + echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")" + return 0 +} + +# args: +# input_files - stdin +# root_path - $1 +# out_path - $2 +# override - $3 +copy_files_or_dirs_from_list() { + eval $invocation + + local root_path="$(remove_trailing_slash "$1")" + local out_path="$(remove_trailing_slash "$2")" + local override="$3" + local osname="$(get_current_os_name)" + local override_switch=$( + if [ "$override" = false ]; then + if [ "$osname" = "linux-musl" ]; then + printf -- "-u"; + else + printf -- "-n"; + fi + fi) + + cat | uniq | while read -r file_path; do + local path="$(remove_beginning_slash "${file_path#$root_path}")" + local target="$out_path/$path" + if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then + mkdir -p "$out_path/$(dirname "$path")" + if [ -d "$target" ]; then + rm -rf "$target" + fi + cp -R $override_switch "$root_path/$path" "$target" + fi + done +} + +# args: +# zip_path - $1 +# out_path - $2 +extract_dotnet_package() { + eval $invocation + + local zip_path="$1" + local out_path="$2" + + local temp_out_path="$(mktemp -d "$temporary_file_template")" + + local failed=false + tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true + + local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/' + find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | sort | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false + find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files" + + rm -rf "$temp_out_path" + + if [ "$failed" = true ]; then + say_err "Extraction failed" + return 1 + fi +} + +# args: +# remote_path - $1 +# [out_path] - $2 - stdout if not provided +download() { + eval $invocation + + local remote_path="$1" + local out_path="${2:-}" + + if [[ "$remote_path" != "http"* ]]; then + cp "$remote_path" "$out_path" + return $? + fi + + local failed=false + if machine_has "curl"; then + downloadcurl "$remote_path" "$out_path" || failed=true + elif machine_has "wget"; then + downloadwget "$remote_path" "$out_path" || failed=true + else + failed=true + fi + if [ "$failed" = true ]; then + say_verbose "Download failed: $remote_path" + return 1 + fi + return 0 +} + +downloadcurl() { + eval $invocation + local remote_path="$1" + local out_path="${2:-}" + + # Append feed_credential as late as possible before calling curl to avoid logging feed_credential + remote_path="${remote_path}${feed_credential}" + + local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs " + local failed=false + if [ -z "$out_path" ]; then + curl $curl_options "$remote_path" || failed=true + else + curl $curl_options -o "$out_path" "$remote_path" || failed=true + fi + if [ "$failed" = true ]; then + say_verbose "Curl download failed" + return 1 + fi + return 0 +} + +downloadwget() { + eval $invocation + local remote_path="$1" + local out_path="${2:-}" + + # Append feed_credential as late as possible before calling wget to avoid logging feed_credential + remote_path="${remote_path}${feed_credential}" + local wget_options="--tries 20 --waitretry 2 --connect-timeout 15 " + local failed=false + if [ -z "$out_path" ]; then + wget -q $wget_options -O - "$remote_path" || failed=true + else + wget $wget_options -O "$out_path" "$remote_path" || failed=true + fi + if [ "$failed" = true ]; then + say_verbose "Wget download failed" + return 1 + fi + return 0 +} + +calculate_vars() { + eval $invocation + valid_legacy_download_link=true + + normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")" + say_verbose "normalized_architecture=$normalized_architecture" + + specific_version="$(get_specific_version_from_version "$azure_feed" "$channel" "$normalized_architecture" "$version" "$json_file")" + specific_product_version="$(get_specific_product_version "$azure_feed" "$specific_version")" + say_verbose "specific_version=$specific_version" + if [ -z "$specific_version" ]; then + say_err "Could not resolve version information." + return 1 + fi + + download_link="$(construct_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" + say_verbose "Constructed primary named payload URL: $download_link" + + legacy_download_link="$(construct_legacy_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false + + if [ "$valid_legacy_download_link" = true ]; then + say_verbose "Constructed legacy named payload URL: $legacy_download_link" + else + say_verbose "Cound not construct a legacy_download_link; omitting..." + fi + + install_root="$(resolve_installation_path "$install_dir")" + say_verbose "InstallRoot: $install_root" +} + +install_dotnet() { + eval $invocation + local download_failed=false + local asset_name='' + local asset_relative_path='' + + if [[ "$runtime" == "dotnet" ]]; then + asset_relative_path="shared/Microsoft.NETCore.App" + asset_name=".NET Core Runtime" + elif [[ "$runtime" == "aspnetcore" ]]; then + asset_relative_path="shared/Microsoft.AspNetCore.App" + asset_name="ASP.NET Core Runtime" + elif [ -z "$runtime" ]; then + asset_relative_path="sdk" + asset_name=".NET Core SDK" + else + say_err "Invalid value for \$runtime" + return 1 + fi + + # Check if the SDK version is already installed. + if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_version"; then + say "$asset_name version $specific_version is already installed." + return 0 + fi + + mkdir -p "$install_root" + zip_path="$(mktemp "$temporary_file_template")" + say_verbose "Zip path: $zip_path" + + say "Downloading link: $download_link" + + # Failures are normal in the non-legacy case for ultimately legacy downloads. + # Do not output to stderr, since output to stderr is considered an error. + download "$download_link" "$zip_path" 2>&1 || download_failed=true + + # if the download fails, download the legacy_download_link + if [ "$download_failed" = true ]; then + say "Cannot download: $download_link" + + if [ "$valid_legacy_download_link" = true ]; then + download_failed=false + download_link="$legacy_download_link" + zip_path="$(mktemp "$temporary_file_template")" + say_verbose "Legacy zip path: $zip_path" + say "Downloading legacy link: $download_link" + download "$download_link" "$zip_path" 2>&1 || download_failed=true + + if [ "$download_failed" = true ]; then + say "Cannot download: $download_link" + fi + fi + fi + + if [ "$download_failed" = true ]; then + say_err "Could not find/download: \`$asset_name\` with version = $specific_version" + say_err "Refer to: https://aka.ms/dotnet-os-lifecycle for information on .NET Core support" + return 1 + fi + + say "Extracting zip from $download_link" + extract_dotnet_package "$zip_path" "$install_root" + + # Check if the SDK version is installed; if not, fail the installation. + # if the version contains "RTM" or "servicing"; check if a 'release-type' SDK version is installed. + if [[ $specific_version == *"rtm"* || $specific_version == *"servicing"* ]]; then + IFS='-' + read -ra verArr <<< "$specific_version" + release_version="${verArr[0]}" + unset IFS; + say_verbose "Checking installation: version = $release_version" + if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$release_version"; then + return 0 + fi + fi + + # Check if the standard SDK version is installed. + say_verbose "Checking installation: version = $specific_product_version" + if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$specific_product_version"; then + return 0 + fi + + say_err "\`$asset_name\` with version = $specific_product_version failed to install with an unknown error." + return 1 +} + +args=("$@") + +local_version_file_relative_path="/.version" +bin_folder_relative_path="" +temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX" + +channel="LTS" +version="Latest" +json_file="" +install_dir="" +architecture="" +dry_run=false +no_path=false +no_cdn=false +azure_feed="https://dotnetcli.azureedge.net/dotnet" +uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet" +feed_credential="" +verbose=false +runtime="" +runtime_id="" +override_non_versioned_files=true +non_dynamic_parameters="" + +while [ $# -ne 0 ] +do + name="$1" + case "$name" in + -c|--channel|-[Cc]hannel) + shift + channel="$1" + ;; + -v|--version|-[Vv]ersion) + shift + version="$1" + ;; + -i|--install-dir|-[Ii]nstall[Dd]ir) + shift + install_dir="$1" + ;; + --arch|--architecture|-[Aa]rch|-[Aa]rchitecture) + shift + architecture="$1" + ;; + --shared-runtime|-[Ss]hared[Rr]untime) + say_warning "The --shared-runtime flag is obsolete and may be removed in a future version of this script. The recommended usage is to specify '--runtime dotnet'." + if [ -z "$runtime" ]; then + runtime="dotnet" + fi + ;; + --runtime|-[Rr]untime) + shift + runtime="$1" + if [[ "$runtime" != "dotnet" ]] && [[ "$runtime" != "aspnetcore" ]]; then + say_err "Unsupported value for --runtime: '$1'. Valid values are 'dotnet' and 'aspnetcore'." + if [[ "$runtime" == "windowsdesktop" ]]; then + say_err "WindowsDesktop archives are manufactured for Windows platforms only." + fi + exit 1 + fi + ;; + --dry-run|-[Dd]ry[Rr]un) + dry_run=true + ;; + --no-path|-[Nn]o[Pp]ath) + no_path=true + non_dynamic_parameters+=" $name" + ;; + --verbose|-[Vv]erbose) + verbose=true + non_dynamic_parameters+=" $name" + ;; + --no-cdn|-[Nn]o[Cc]dn) + no_cdn=true + non_dynamic_parameters+=" $name" + ;; + --azure-feed|-[Aa]zure[Ff]eed) + shift + azure_feed="$1" + non_dynamic_parameters+=" $name "\""$1"\""" + ;; + --uncached-feed|-[Uu]ncached[Ff]eed) + shift + uncached_feed="$1" + non_dynamic_parameters+=" $name "\""$1"\""" + ;; + --feed-credential|-[Ff]eed[Cc]redential) + shift + feed_credential="$1" + non_dynamic_parameters+=" $name "\""$1"\""" + ;; + --runtime-id|-[Rr]untime[Ii]d) + shift + runtime_id="$1" + non_dynamic_parameters+=" $name "\""$1"\""" + ;; + --jsonfile|-[Jj][Ss]on[Ff]ile) + shift + json_file="$1" + ;; + --skip-non-versioned-files|-[Ss]kip[Nn]on[Vv]ersioned[Ff]iles) + override_non_versioned_files=false + non_dynamic_parameters+=" $name" + ;; + -?|--?|-h|--help|-[Hh]elp) + script_name="$(basename "$0")" + echo ".NET Tools Installer" + echo "Usage: $script_name [-c|--channel ] [-v|--version ] [-p|--prefix ]" + echo " $script_name -h|-?|--help" + echo "" + echo "$script_name is a simple command line interface for obtaining dotnet cli." + echo "" + echo "Options:" + echo " -c,--channel Download from the channel specified, Defaults to \`$channel\`." + echo " -Channel" + echo " Possible values:" + echo " - Current - most current release" + echo " - LTS - most current supported release" + echo " - 2-part version in a format A.B - represents a specific release" + echo " examples: 2.0; 1.0" + echo " - Branch name" + echo " examples: release/2.0.0; Master" + echo " Note: The version parameter overrides the channel parameter." + echo " -v,--version Use specific VERSION, Defaults to \`$version\`." + echo " -Version" + echo " Possible values:" + echo " - latest - most latest build on specific channel" + echo " - coherent - most latest coherent build on specific channel" + echo " coherent applies only to SDK downloads" + echo " - 3-part version in a format A.B.C - represents specific version of build" + echo " examples: 2.0.0-preview2-006120; 1.1.0" + echo " -i,--install-dir Install under specified location (see Install Location below)" + echo " -InstallDir" + echo " --architecture Architecture of dotnet binaries to be installed, Defaults to \`$architecture\`." + echo " --arch,-Architecture,-Arch" + echo " Possible values: x64, arm, and arm64" + echo " --runtime Installs a shared runtime only, without the SDK." + echo " -Runtime" + echo " Possible values:" + echo " - dotnet - the Microsoft.NETCore.App shared runtime" + echo " - aspnetcore - the Microsoft.AspNetCore.App shared runtime" + echo " --dry-run,-DryRun Do not perform installation. Display download link." + echo " --no-path, -NoPath Do not set PATH for the current process." + echo " --verbose,-Verbose Display diagnostics information." + echo " --azure-feed,-AzureFeed Azure feed location. Defaults to $azure_feed, This parameter typically is not changed by the user." + echo " --uncached-feed,-UncachedFeed Uncached feed location. This parameter typically is not changed by the user." + echo " --feed-credential,-FeedCredential Azure feed shared access token. This parameter typically is not specified." + echo " --skip-non-versioned-files Skips non-versioned files if they already exist, such as the dotnet executable." + echo " -SkipNonVersionedFiles" + echo " --no-cdn,-NoCdn Disable downloading from the Azure CDN, and use the uncached feed directly." + echo " --jsonfile Determines the SDK version from a user specified global.json file." + echo " Note: global.json must have a value for 'SDK:Version'" + echo " --runtime-id Installs the .NET Tools for the given platform (use linux-x64 for portable linux)." + echo " -RuntimeId" + echo " -?,--?,-h,--help,-Help Shows this help message" + echo "" + echo "Obsolete parameters:" + echo " --shared-runtime The recommended alternative is '--runtime dotnet'." + echo " This parameter is obsolete and may be removed in a future version of this script." + echo " Installs just the shared runtime bits, not the entire SDK." + echo "" + echo "Install Location:" + echo " Location is chosen in following order:" + echo " - --install-dir option" + echo " - Environmental variable DOTNET_INSTALL_DIR" + echo " - $HOME/.dotnet" + exit 0 + ;; + *) + say_err "Unknown argument \`$name\`" + exit 1 + ;; + esac + + shift +done + +if [ "$no_cdn" = true ]; then + azure_feed="$uncached_feed" +fi + +check_min_reqs +calculate_vars +script_name=$(basename "$0") + +if [ "$dry_run" = true ]; then + say "Payload URLs:" + say "Primary named payload URL: $download_link" + if [ "$valid_legacy_download_link" = true ]; then + say "Legacy named payload URL: $legacy_download_link" + fi + repeatable_command="./$script_name --version "\""$specific_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\""" + if [[ "$runtime" == "dotnet" ]]; then + repeatable_command+=" --runtime "\""dotnet"\""" + elif [[ "$runtime" == "aspnetcore" ]]; then + repeatable_command+=" --runtime "\""aspnetcore"\""" + fi + repeatable_command+="$non_dynamic_parameters" + say "Repeatable invocation: $repeatable_command" + exit 0 +fi + +check_pre_reqs +install_dotnet + +bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")" +if [ "$no_path" = false ]; then + say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script." + export PATH="$bin_path":"$PATH" +else + say "Binaries of dotnet can be found in $bin_path" +fi + +say "Installation finished successfully." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 055304ad89bf..d0c3cc2b3ba5 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -67,6 +67,7 @@ jobs: /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) + /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -87,11 +88,6 @@ jobs: ArtifactName: ReleaseConfigs - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs to VSTS - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: $(Agent.Os)_PublishBuildAssets - continueOnError: true - condition: always() + - template: /eng/common/templates/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index f91751fe78e1..428026d2e78b 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,21 +3,20 @@ parameters: JobLabel: '' steps: -- task: Powershell@2 - displayName: Prepare Binlogs to Upload +- task: CopyFiles@2 + displayName: Copy Logs to $(Build.StagingDirectory)\BuildLogs inputs: - targetType: inline - script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + SourceFolder: $(Build.SourcesDirectory)\artifacts + Contents: | + **/*.log + **/*.binlog + TargetFolder: '$(Build.StagingDirectory)\BuildLogs' continueOnError: true - condition: always() - -- task: PublishBuildArtifacts@1 - displayName: Publish Logs + condition: succeededOrFailed() + +- task: PublishPipelineArtifact@1 + displayName: Publish BuildLogs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' - PublishLocation: Container - ArtifactName: PostBuildLogs - continueOnError: true - condition: always() + targetPath: '$(Build.StagingDirectory)\BuildLogs' + artifactName: ${{ parameters.JobLabel }} + condition: succeededOrFailed() diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c2e575c97ccb..1bf215525b34 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -57,11 +57,15 @@ set-strictmode -version 2.0 $ErrorActionPreference = 'Stop' [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -# If specifies, provides an alternate path for getting .NET Core SDKs and Runtimes. This script will still try public sources first. +# If specified, provides an alternate path for getting .NET Core SDKs and Runtimes. This script will still try public sources first. [string]$runtimeSourceFeed = if (Test-Path variable:runtimeSourceFeed) { $runtimeSourceFeed } else { $null } # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } +# If false, use copy of dotnet-install from /eng/common/dotnet-install-scripts (for custom behaviors). +# otherwise will fetch from public location. +[bool]$useDefaultDotnetInstall = if (Test-Path variable:useDefaultDotnetInstall) { $useDefaultDotnetInstall } else { $false } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -193,37 +197,46 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' if (!(Test-Path $installScript)) { - Create-Directory $dotnetRoot - $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - - $maxRetries = 5 - $retries = 1 - - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" - - while($true) { - try { - Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript - break - } - catch { - Write-Host "Failed to download '$uri'" - Write-Error $_.Exception.Message -ErrorAction Continue - } - - if (++$retries -le $maxRetries) { - $delayInSeconds = [math]::Pow(2, $retries) - 1 # Exponential backoff - Write-Host "Retrying. Waiting for $delayInSeconds seconds before next attempt ($retries of $maxRetries)." - Start-Sleep -Seconds $delayInSeconds - } - else { - throw "Unable to download file in $maxRetries attempts." + create-directory $dotnetroot + + if ($useDefaultDotnetInstall) + { + $progresspreference = 'silentlycontinue' # don't display the console progress ui - it's a huge perf hit + + $maxretries = 5 + $retries = 1 + + $uri = "https://dot.net/$dotnetinstallscriptversion/dotnet-install.ps1" + + while($true) { + try { + write-host "get $uri" + invoke-webrequest $uri -outfile $installscript + break + } + catch { + write-host "failed to download '$uri'" + write-error $_.exception.message -erroraction continue + } + + if (++$retries -le $maxretries) { + $delayinseconds = [math]::pow(2, $retries) - 1 # exponential backoff + write-host "retrying. waiting for $delayinseconds seconds before next attempt ($retries of $maxretries)." + start-sleep -seconds $delayinseconds + } + else { + throw "unable to download file in $maxretries attempts." + } } - + } + else + { + # Use a special version of the script from eng/common that understands the existence of a "productVersion.txt" in a dotnet path. + # See https://github.com/dotnet/arcade/issues/6047 for details + $engCommonCopy = Resolve-Path (Join-Path $PSScriptRoot 'dotnet-install-scripts\dotnet-install.ps1') + Copy-Item $engCommonCopy -Destination $installScript -Force } } - return $installScript } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 2be5cba3070b..c722a0585317 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -68,6 +68,10 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} +# Determines if dotnet-install.sh comes from the eng/common folder or the internet +# (default = public version) +use_default_dotnet_install=${use_default_dotnet_install:-false} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -267,23 +271,30 @@ function GetDotNetInstallScript { if [[ ! -a "$install_script" ]]; then mkdir -p "$root" - echo "Downloading '$install_script_url'" + if [[ "$use_default_dotnet_install" == true ]]; then + echo "Downloading '$install_script_url'" - # Use curl if available, otherwise use wget - if command -v curl > /dev/null; then - with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." - ExitWithExitCode $exit_code - } + # Use curl if available, otherwise use wget + if command -v curl > /dev/null; then + with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + with_retries wget -v -O "$install_script" "$install_script_url" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + fi else - with_retries wget -v -O "$install_script" "$install_script_url" || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." - ExitWithExitCode $exit_code - } + # Use a special version of the script from eng/common that understands the existence of a "productVersion.txt" in a dotnet path. + # See https://github.com/dotnet/arcade/issues/6047 for details + cp $repo_root/eng/common/dotnet-install-scripts/dotnet-install.sh $install_script fi fi + # return value _GetDotNetInstallScript="$install_script" } diff --git a/global.json b/global.json index 87ff39019c2b..85ae6f4dd0f6 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.8.0-preview3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20427.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.1" } } From bec1a700664651be8025b26046700e858aeca825 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 06:09:25 +0000 Subject: [PATCH 192/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13273) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - dotnet-watch: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - dotnet-user-secrets: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - dotnet-dev-certs: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20430.3 to 5.0.0-rc.1.20431.22 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69aa13711d47..bbd65295fa92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 24c51e5fa491fe4b7690115225aa231f1fd7bdad - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 04f23ecfc49edb0968176450c715eddb3e93f2a0 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 4d70e8cc5cea..806c39d576f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 - 5.0.0-rc.1.20430.3 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.22 From 13bad23792a01200a32eedbff6766ce3802133e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 06:42:42 +0000 Subject: [PATCH 193/214] Update dependencies from https://github.com/dotnet/runtime build 20200831.14 (#13286) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - System.Resources.Extensions: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20431.7 to 5.0.0-rc.1.20431.14 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbd65295fa92..1ca717263755 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a https://github.com/dotnet/arcade 4be47e467013f8a07a1ed7b6e49e39c8150bde54 - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - af1a3dceb0fc6919f1757ca4b30ffe0174c62e67 + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index 806c39d576f0..de0e3cec1a52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20431.1 3.1.0 - 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.14 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20431.7 - 5.0.0-rc.1.20431.7 - 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20431.7 - 5.0.0-rc.1.20431.7 - 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20431.7 - 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20431.14 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20431.7 + 5.0.0-rc.1.20431.14 From 88888ac4bc82af461426c3bbfbb994dbe2ab6c06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 08:43:02 +0000 Subject: [PATCH 194/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200831.23 (#13288) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - dotnet-watch: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - dotnet-user-secrets: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - dotnet-dev-certs: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20431.22 to 5.0.0-rc.1.20431.23 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ca717263755..c5efcb24f5bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 24c51e5fa491fe4b7690115225aa231f1fd7bdad - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da - + https://github.com/dotnet/aspnetcore - 04f23ecfc49edb0968176450c715eddb3e93f2a0 + 48c126109758a02de069145bf9a374d99bad89da https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index de0e3cec1a52..5b2dd1b88233 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 - 5.0.0-rc.1.20431.22 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.23 From 52d9a91e5aca316d20f49ed88e870a1b5a4fee75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 09:24:20 +0000 Subject: [PATCH 195/214] Update dependencies from https://github.com/mono/linker build 20200831.3 (#13284) [release/5.0.1xx] Update dependencies from mono/linker - Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20431.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5efcb24f5bc..cde452fddf6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ https://github.com/microsoft/vstest 4fcacb284064e66e670689b9888c0c438b1f4154 - + https://github.com/mono/linker - 4f7c0584f510cdb3e1eeb9106f229e73085b1b73 + 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5b2dd1b88233..97257e9accff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20431.3 From 0240754d6cbf74f7d96d4f87ce7546668fc86ae9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 09:44:22 +0000 Subject: [PATCH 196/214] [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop (#13278) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.13 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.13 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.13 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.2 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.2 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20431.1 - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20430.1 to 5.0.0-rc.1.20431.2 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20431.1 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cde452fddf6b..136a21c57e64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/windowsdesktop - 4f2e207f37ed38090110ae1635b1d83aba82dd30 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/windowsdesktop - 4f2e207f37ed38090110ae1635b1d83aba82dd30 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/windowsdesktop - 4f2e207f37ed38090110ae1635b1d83aba82dd30 + 7e542661acee7dea547ff4466ffe6ea232e81fb3 - + https://github.com/dotnet/wpf - 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 + de2e9785920c11aca594fc3506b8d8052b9b3260 - + https://github.com/dotnet/wpf - 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 + de2e9785920c11aca594fc3506b8d8052b9b3260 - + https://github.com/dotnet/winforms - 24c51e5fa491fe4b7690115225aa231f1fd7bdad + e9176d39fa30c6fda81b679274b9316329e0c35e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 97257e9accff..05ce31ab9154 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20430.1 + 5.0.0-rc.1.20431.2 - 5.0.0-rc.1.20430.1 + 5.0.0-rc.1.20431.13 From 0ed2a78ea893c81ad7c8c382743b19089d9bb9b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 11:06:02 +0000 Subject: [PATCH 197/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200831.24 (#13291) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - dotnet-watch: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - dotnet-user-secrets: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - dotnet-dev-certs: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20431.23 to 5.0.0-rc.1.20431.24 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 136a21c57e64..dde4a21db164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms e9176d39fa30c6fda81b679274b9316329e0c35e - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - 48c126109758a02de069145bf9a374d99bad89da + 7579b300f70e6c61c31d99a6755f0c913b374bf0 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 05ce31ab9154..55ed58d84586 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 - 5.0.0-rc.1.20431.23 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20431.24 From 5cd116897e8cff0ae32a51cf0042a1912f58ef59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 13:47:22 +0000 Subject: [PATCH 198/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200901.2 (#13294) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - dotnet-watch: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - dotnet-user-secrets: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - dotnet-dev-certs: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dde4a21db164..36b62b456c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 82b3b1f2d95299c9f511069eff25d0501fc2421d - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms e9176d39fa30c6fda81b679274b9316329e0c35e - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed - + https://github.com/dotnet/aspnetcore - 7579b300f70e6c61c31d99a6755f0c913b374bf0 + a7a2800658c313bc68de7c29ce735e9dad0ea1ed https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 55ed58d84586..29f235527784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 - 5.0.0-rc.1.20431.24 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 From 9d1d639165b8c87bb2e319cdd295b81a4240bb40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 07:33:23 -0700 Subject: [PATCH 199/214] Update dependencies from https://github.com/dotnet/roslyn build 20200901.2 (#13287) Microsoft.Net.Compilers.Toolset From Version 3.8.0-3.20420.1 -> To Version 3.8.0-3.20451.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36b62b456c75..d54611750606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,9 +61,9 @@ https://github.com/dotnet/fsharp 068ebd3c599bc5a47163a18b8b90d2fe5517186e - + https://github.com/dotnet/roslyn - 82b3b1f2d95299c9f511069eff25d0501fc2421d + 0b7c260d73d9735f1179cda473739857057164ab https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 29f235527784..da92b91b45aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ - 3.8.0-3.20420.1 + 3.8.0-3.20451.2 From 7b83453309ae848921db0efe26661e82307c2dc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 16:51:48 +0000 Subject: [PATCH 200/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13290) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - System.Resources.Extensions: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.2 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d54611750606..a4dcc6edff46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 https://github.com/dotnet/arcade 4be47e467013f8a07a1ed7b6e49e39c8150bde54 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index da92b91b45aa..295ab3efdec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20431.1 3.1.0 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.2 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20431.14 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.2 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.2 From 4a120da39af45082c450a37b0d3e78263ee54a2e Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Tue, 1 Sep 2020 11:04:34 -0700 Subject: [PATCH 201/214] Switching to 4 part Windows versions (#13272) * Switching to 4 part Windows versions * PR feedback * Fixing target platform version test value --- ...osoft.NET.TargetFrameworkInference.targets | 15 +++++------- ...T.WindowsSdkSupportedTargetPlatforms.props | 6 ++--- .../GivenThatWeWantToBuildALibrary.cs | 2 +- ...ThatWeWantToBuildAWindowsDesktopProject.cs | 17 ++++++++----- ...venThatWeWantToBuildWithATargetPlatform.cs | 24 ++++++++++++++++++- 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets index a00804849e05..cbacddc088d0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets @@ -52,20 +52,17 @@ Copyright (c) .NET Foundation. All rights reserved. $([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) - v$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 3)) - <_TargetFrameworkVersionLength Condition="$(TargetFrameworkVersion.EndsWith('.0'))" >$([MSBuild]::Subtract($(TargetFrameworkVersion.Length), 2)) - $(TargetFrameworkVersion.Substring(0, $(_TargetFrameworkVersionLength))) + v$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)', 2)) - - $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - $([MSBuild]::GetTargetPlatformVersion('$(TargetFramework)', 3)) - - <_TargetPlatformVersionLength Condition="$(TargetPlatformVersion.EndsWith('.0'))" >$([MSBuild]::Subtract($(TargetPlatformVersion.Length), 2)) - $(TargetPlatformVersion.Substring(0, $(_TargetPlatformVersionLength))) + + $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) + $([MSBuild]::GetTargetPlatformVersion('$(TargetFramework)', 4)) + $([MSBuild]::GetTargetPlatformVersion('$(TargetFramework)', 2)) + Windows diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props index b27e16caff12..5041005639a4 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.WindowsSdkSupportedTargetPlatforms.props @@ -13,9 +13,9 @@ Copyright (c) .NET Foundation. All rights reserved. - - - + + + diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs index 0a63fa9c611f..7023057847b6 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs @@ -454,7 +454,7 @@ public void It_implicitly_defines_compilation_constants_for_the_target_platform( [Theory] [InlineData(new[] { "1.0", "1.1" }, "ios", "1.1", new[] { "IOS", "IOS1_1", "IOS1_0" })] [InlineData(new[] { "11.11", "12.12", "13.13" }, "android", "12.12", new[] { "ANDROID", "ANDROID11_11", "ANDROID12_12" })] - [InlineData(new string[] { /* Use the built in SdkSupportedTargetPlatform items */}, "windows", "10.0.19041", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763", "WINDOWS10_0_18362", "WINDOWS10_0_19041" })] + [InlineData(new string[] { /* Use the built in SdkSupportedTargetPlatform items */}, "windows", "10.0.19041.0", new[] { "WINDOWS", "WINDOWS7_0", "WINDOWS8_0", "WINDOWS10_0_17763_0", "WINDOWS10_0_18362_0", "WINDOWS10_0_19041_0" })] public void It_implicitly_defines_compilation_constants_for_the_target_platform_with_backwards_compatibility(string[] sdkSupportedTargetPlatform, string targetPlatformIdentifier, string targetPlatformVersion, string[] expectedDefines) { var targetFramework = "net5.0"; diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index ab364978b385..f2b1c304d1b9 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -122,17 +122,22 @@ public void It_fails_if_windows_target_platform_version_is_invalid() .HaveStdOutContaining("NETSDK1140"); } - [WindowsOnlyFact] - public void It_succeeds_if_windows_target_platform_version_has_trailing_zeros() + [WindowsOnlyTheory] + [InlineData(true)] + [InlineData(false)] + public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework) { var testProject = new TestProject() { Name = "ValidWindowsVersion", IsSdkProject = true, - TargetFrameworks = "net5.0" + TargetFrameworks = setInTargetframework ? "net5.0-windows10.0.18362" : "net5.0" }; - testProject.AdditionalProperties["TargetPlatformIdentifier"] = "Windows"; - testProject.AdditionalProperties["TargetPlatformVersion"] = "10.0.18362.0"; // We must set this manually because if we set it in the TFM we remove the trailing zeroes. + if (!setInTargetframework) + { + testProject.AdditionalProperties["TargetPlatformIdentifier"] = "Windows"; + testProject.AdditionalProperties["TargetPlatformVersion"] = "10.0.18362"; + } var testAsset = _testAssetsManager.CreateTestProject(testProject); var buildCommand = new BuildCommand(testAsset); @@ -144,7 +149,7 @@ public void It_succeeds_if_windows_target_platform_version_has_trailing_zeros() getValuesCommand.Execute() .Should() .Pass(); - getValuesCommand.GetValues().Should().BeEquivalentTo(new[] { "10.0.18362" }); + getValuesCommand.GetValues().Should().BeEquivalentTo(new[] { "10.0.18362.0" }); } [Fact] diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs index a4144f548dab..33a7e20f0d54 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithATargetPlatform.cs @@ -25,7 +25,7 @@ public GivenThatWeWantToBuildWithATargetPlatform(ITestOutputHelper log) : base(l [InlineData("net5.0-Windows7.0", ".NETCoreApp", "v5.0", "Windows", "7.0")] [InlineData("net5.0-WINDOWS7.0", ".NETCoreApp", "v5.0", "Windows", "7.0")] [InlineData("net5.0-windows", ".NETCoreApp", "v5.0", "Windows", "7.0")] - [InlineData("net5.0-windows10.0.19041", ".NETCoreApp", "v5.0", "Windows", "10.0.19041")] + [InlineData("net5.0-windows10.0.19041.0", ".NETCoreApp", "v5.0", "Windows", "10.0.19041.0")] public void It_defines_target_platform_from_target_framework(string targetFramework, string expectedTargetFrameworkIdentifier, string expectedTargetFrameworkVersion, string expectedTargetPlatformIdentifier, string expectedTargetPlatformVersion) { var testProj = new TestProject() @@ -63,6 +63,28 @@ public void It_defines_target_platform_from_target_framework(string targetFramew assertValue("TargetPlatformDisplayName", $"{expectedTargetPlatformIdentifier} {expectedTargetPlatformVersion}"); } + [WindowsOnlyRequiresMSBuildVersionFact("16.8.0.41402")] + public void It_defines_target_platform_from_target_framework_with_explicit_version() + { + var targetPlatformVersion = "10.0.19041.0"; + var targetFramework = "net5.0-windows"; + var testProj = new TestProject() + { + Name = "TargetPlatformTests", + IsSdkProject = true, + TargetFrameworks = targetFramework + }; + testProj.AdditionalProperties["TargetPlatformVersion"] = targetPlatformVersion; + var testAsset = _testAssetsManager.CreateTestProject(testProj); + + var getValuesCommand = new GetValuesCommand(Log, Path.Combine(testAsset.Path, testProj.Name), targetFramework, "TargetPlatformIdentifier"); + getValuesCommand + .Execute() + .Should() + .Pass(); + getValuesCommand.GetValues().ShouldBeEquivalentTo(new[] { "Windows" }); + } + [Fact] public void It_fails_on_unsupported_os() { From 3d342258bf7b991c6bf766afa0c6a6985996ee42 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 1 Sep 2020 13:47:04 -0700 Subject: [PATCH 202/214] Update first run message (#13307) --- documentation/general/tab-completion.md | 15 ++------------- .../LocalizableStrings.resx | 2 +- .../xlf/LocalizableStrings.cs.xlf | 2 +- .../xlf/LocalizableStrings.de.xlf | 2 +- .../xlf/LocalizableStrings.es.xlf | 4 ++-- .../xlf/LocalizableStrings.fr.xlf | 2 +- .../xlf/LocalizableStrings.it.xlf | 2 +- .../xlf/LocalizableStrings.ja.xlf | 2 +- .../xlf/LocalizableStrings.ko.xlf | 2 +- .../xlf/LocalizableStrings.pl.xlf | 2 +- .../xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../xlf/LocalizableStrings.ru.xlf | 2 +- .../xlf/LocalizableStrings.tr.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 15 files changed, 17 insertions(+), 28 deletions(-) diff --git a/documentation/general/tab-completion.md b/documentation/general/tab-completion.md index 4687e897e5db..a4dd2ffba9d0 100644 --- a/documentation/general/tab-completion.md +++ b/documentation/general/tab-completion.md @@ -27,19 +27,8 @@ If you just installed `dotnet` you may see the first-run output: Welcome to .NET Core! --------------------- Learn more about .NET Core: https://aka.ms/dotnet-docs -Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cli-docs - -Telemetry ---------- -The .NET Core tools collect usage data in order to help us improve your experience. The data is anonymous and doesn't include command-line arguments. The data is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. - -Read more about .NET Core CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry - -Configuring... --------------- -A command is running to populate your local package cache to improve restore speed and enable offline access. This command takes up to one minute to complete and only runs once. -Decompressing 100% 4936 ms -Expanding 100% 17195 ms +... +... ``` You should see the following ouput (perhaps coming at the end of the first-run output). This indicates that `dotnet` is resolving to a v2.0 installation that supports completion. diff --git a/src/Cli/Microsoft.DotNet.Configurer/LocalizableStrings.resx b/src/Cli/Microsoft.DotNet.Configurer/LocalizableStrings.resx index 181086c5f5f9..e5d77533d328 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/LocalizableStrings.resx +++ b/src/Cli/Microsoft.DotNet.Configurer/LocalizableStrings.resx @@ -128,7 +128,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf index f62cba5ac35a..0e9164b30a7e 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetrie diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf index 7d9ca5bb9c72..623f23148e34 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetrie diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 0ce990347b34..c86cd7118a97 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetría @@ -56,4 +56,4 @@ Lea más sobre la telemetría de las herramientas de la CLI de .NET Core: https: - + \ No newline at end of file diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf index f160d89beac2..f933ec73ba41 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Télémétrie diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf index d39d7b1716b6..fc6d3609a14c 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetria diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf index 57bc29377a5e..9217b3561b81 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry テレメトリ diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf index 7c0d5dcf8bdd..7ddb65f20baf 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry 원격 분석 diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf index 4104c467f4a3..0b7cd44b6f13 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetria diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf index 8257140f8d88..bf069f7b1d18 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetria! diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf index 326cc09fb9aa..f1d323a8ea10 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Телеметрия diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf index ae4d27370bcb..4edac1181dd3 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry Telemetri diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf index 63f2456f905a..74a85b04cd5f 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry 遥测 diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf index 2c289a0a1e52..5497b99f9786 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf @@ -44,7 +44,7 @@ SDK Version: {1} Telemetry --------- -The .NET tools collect usage data in order to help us improve your experience. The data is anonymous. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. +The .NET tools collect usage data in order to help us improve your experience. It is collected by Microsoft and shared with the community. You can opt-out of telemetry by setting the DOTNET_CLI_TELEMETRY_OPTOUT environment variable to '1' or 'true' using your favorite shell. Read more about .NET CLI Tools telemetry: https://aka.ms/dotnet-cli-telemetry 遙測 From 91b7aad3c4a43067847ffcdff4a2c58134ef5803 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 21:36:26 +0000 Subject: [PATCH 203/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200901.7 (#13305) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 (parent: Microsoft.WindowsDesktop.App) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.4 (parent: Microsoft.WindowsDesktop.App) - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.7 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.7 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.7 - Microsoft.NET.Sdk.WindowsDesktop: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4dcc6edff46..2b9e730403a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 036dc2b705089041faadb5287a32b67924ab8533 - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 036dc2b705089041faadb5287a32b67924ab8533 - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 036dc2b705089041faadb5287a32b67924ab8533 - + https://github.com/dotnet/wpf - de2e9785920c11aca594fc3506b8d8052b9b3260 + 48bea1ca59aae317957fea2d573395ee9edc21d4 - + https://github.com/dotnet/wpf - de2e9785920c11aca594fc3506b8d8052b9b3260 + 48bea1ca59aae317957fea2d573395ee9edc21d4 - + https://github.com/dotnet/winforms - e9176d39fa30c6fda81b679274b9316329e0c35e + 8c52921c5371cfb864442491a8d89739296a75f2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 295ab3efdec0..6cf379b334e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20431.2 + 5.0.0-rc.1.20451.4 - 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20451.7 From 6af4695d8ff56322bb3f648d1eda94436c7ee496 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 00:14:43 +0000 Subject: [PATCH 204/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200901.8 (#13309) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20451.7 to 5.0.0-rc.1.20451.8 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20451.7 to 5.0.0-rc.1.20451.8 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20451.7 to 5.0.0-rc.1.20451.8 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b9e730403a7..00658937e111 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,17 +105,17 @@ https://github.com/dotnet/runtime 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 - + https://github.com/dotnet/windowsdesktop - 036dc2b705089041faadb5287a32b67924ab8533 + 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 - + https://github.com/dotnet/windowsdesktop - 036dc2b705089041faadb5287a32b67924ab8533 + 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 - + https://github.com/dotnet/windowsdesktop - 036dc2b705089041faadb5287a32b67924ab8533 + 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 6cf379b334e9..6ec0dc1d7f5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ - 5.0.0-rc.1.20451.7 + 5.0.0-rc.1.20451.8 From 6ca225302390e64048ac4cb5fd2af321b80f5895 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 00:32:25 +0000 Subject: [PATCH 205/214] [release/5.0.1xx] Update dependencies from dotnet/msbuild (#13300) [release/5.0.1xx] Update dependencies from dotnet/msbuild - Updates: - Microsoft.Build.Localization: from 16.8.0-preview-20429-01 to 16.8.0-preview-20451-02 - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20451-02 - Update registry package verison --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- src/Cli/dotnet/dotnet.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00658937e111..16aa1d0f7ae2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,13 +49,13 @@ https://github.com/dotnet/CliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 - + https://github.com/dotnet/msbuild - d58e2b7864627321d75b7a47850e9b80deac7db6 + 51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491 - + https://github.com/dotnet/msbuild - d58e2b7864627321d75b7a47850e9b80deac7db6 + 51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6ec0dc1d7f5c..fd60f44f87f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,10 +85,10 @@ - 16.8.0-preview-20429-01 + 16.8.0-preview-20451-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 16.8.0-preview-20429-01 + 16.8.0-preview-20451-02 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildFrameworkPackageVersion) diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 1e9cb3f83921..eb896c8a71a9 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -74,7 +74,7 @@ - + From b51261b6372377afae1253e408831aa869d00117 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 03:24:27 +0000 Subject: [PATCH 206/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13303) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.9 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16aa1d0f7ae2..55d2e94b8c62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 0b7c260d73d9735f1179cda473739857057164ab - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 8c52921c5371cfb864442491a8d89739296a75f2 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index fd60f44f87f3..e60e77614114 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.9 From c6e0ecd16d22a9079e0a11200a61b972de736875 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 Sep 2020 21:15:16 -0700 Subject: [PATCH 207/214] Source dependency on Microsoft.DotNet.SdkResolver (#13311) --- ...Microsoft.DotNet.MSBuildSdkResolver.csproj | 34 +++++++++++++++++-- .../GivenAnMSBuildSdkResolver.cs | 3 +- ...oft.DotNet.MSBuildSdkResolver.Tests.csproj | 6 +++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index a06a92563543..f98311fdca8b 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -15,7 +15,7 @@ - + @@ -33,8 +33,36 @@ + - + - + + + + + + + + + + x86/hostfxr.dll + PreserveNewest + + + x64/hostfxr.dll + PreserveNewest + + + + + + + + true + + + + + \ No newline at end of file diff --git a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs index a91e9c877c5f..3ef689e59807 100644 --- a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs +++ b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/GivenAnMSBuildSdkResolver.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +extern alias sdkResolver; using FluentAssertions; using Microsoft.Build.Framework; using Microsoft.DotNet.MSBuildSdkResolver; @@ -496,7 +497,7 @@ public void GivenTemplateLocatorItCanResolveSdkVersion() environment.CreateMuxerAndAddToPath(ProgramFiles.X64); var resolver = new TemplateLocator.TemplateLocator(environment.GetEnvironmentVariable, - new VSSettings(environment.VSSettingsFile?.FullName, environment.DisallowPrereleaseByDefault)); + new sdkResolver::Microsoft.DotNet.DotNetSdkResolver.VSSettings(environment.VSSettingsFile?.FullName, environment.DisallowPrereleaseByDefault)); resolver.TryGetDotnetSdkVersionUsedInVs("15.8", out var version).Should().BeTrue(); version.Should().Be(sdkVersion); diff --git a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index 5938d24d4894..f7b7e7d5f00d 100644 --- a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -13,7 +13,11 @@ - + + + + sdkResolver + From d6b5eb857c4cc401e1cc9443c35503b6c4a2d699 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 06:05:36 +0000 Subject: [PATCH 208/214] [release/5.0.1xx] Update dependencies from dotnet/runtime (#13310) [release/5.0.1xx] Update dependencies from dotnet/runtime - Updates: - System.CodeDom: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NET.HostModel: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.Extensions.DependencyModel: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - System.Text.Encoding.CodePages: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - System.Resources.Extensions: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 - System.Security.Cryptography.ProtectedData: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.14 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55d2e94b8c62..761d9e414b45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,41 +9,41 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/dotnet/arcade 4be47e467013f8a07a1ed7b6e49e39c8150bde54 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/dotnet/CliCommandLineParser @@ -89,21 +89,21 @@ https://github.com/mono/linker 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 54e597d3a5c2b6c0e9dc556a79bba08fb0c67eb9 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/dotnet/windowsdesktop diff --git a/eng/Versions.props b/eng/Versions.props index e60e77614114..254624a09340 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ 1.8.0 5.0.0-beta.20431.1 3.1.0 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.14 4.3.0 4.3.0 4.0.5 @@ -37,13 +37,13 @@ - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -74,10 +74,10 @@ - 5.0.0-rc.1.20451.2 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 5.0.0-preview.7.20307.4 - 5.0.0-rc.1.20451.2 + 5.0.0-rc.1.20451.14 From eeaf30006ee5538ee7bbf7d1d7f007a7f0f2f381 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 07:01:47 +0000 Subject: [PATCH 209/214] Update dependencies from https://github.com/dotnet/aspnetcore build 20200901.12 (#13315) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - dotnet-watch: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - dotnet-user-secrets: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - dotnet-dev-certs: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20451.9 to 5.0.0-rc.1.20451.12 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 761d9e414b45..c254ce0b84b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 0b7c260d73d9735f1179cda473739857057164ab - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 8c52921c5371cfb864442491a8d89739296a75f2 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 - + https://github.com/dotnet/aspnetcore - 19d11b2c81c08d3365772a70bb1c91dfc9e53f4c + 7527117084c69a39062443e1f2da6ea09c48b9d6 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 254624a09340..d8cfe743ac0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 - 5.0.0-rc.1.20451.9 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.12 From f69ddb79ea3f311d6c6506ef1785230925d5535f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 09:26:40 +0000 Subject: [PATCH 210/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200901.14 (#13314) [release/5.0.1xx] Update dependencies from dotnet/windowsdesktop - Updates: - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20451.8 to 5.0.0-rc.1.20451.14 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20451.8 to 5.0.0-rc.1.20451.14 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20451.8 to 5.0.0-rc.1.20451.14 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c254ce0b84b1..7c9e06e94640 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,17 +105,17 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/windowsdesktop - 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 + 3b198e9a3edaf7e183580e1d95d720d03f944447 - + https://github.com/dotnet/windowsdesktop - 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 + 3b198e9a3edaf7e183580e1d95d720d03f944447 - + https://github.com/dotnet/windowsdesktop - 87fcf57e1a6f89253de3620c5e9c8b738bc692b5 + 3b198e9a3edaf7e183580e1d95d720d03f944447 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index d8cfe743ac0d..b972a422f045 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ - 5.0.0-rc.1.20451.8 + 5.0.0-rc.1.20451.14 From c44610a2263d648659fda5023d9c322a5948d522 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 13:25:16 +0000 Subject: [PATCH 211/214] [release/5.0.1xx] Update dependencies from dotnet/aspnetcore (#13317) [release/5.0.1xx] Update dependencies from dotnet/aspnetcore - Updates: - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - dotnet-watch: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - dotnet-user-secrets: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - dotnet-dev-certs: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.Analyzers: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.Components.Analyzers: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.NET.Sdk.Razor: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.NET.Sdk.BlazorWebAssembly: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.DeveloperCertificates.XPlat: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.Mvc.Api.Analyzers: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.Mvc.Analyzers: from 5.0.0-rc.1.20451.12 to 5.0.0-rc.1.20451.17 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c9e06e94640..926fec42a04c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,17 +65,17 @@ https://github.com/dotnet/roslyn 0b7c260d73d9735f1179cda473739857057164ab - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 https://github.com/NuGet/NuGet.Client @@ -129,45 +129,45 @@ https://github.com/dotnet/winforms 8c52921c5371cfb864442491a8d89739296a75f2 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - 7527117084c69a39062443e1f2da6ea09c48b9d6 + ecdcc752d4639061c2c49727ee77a1039bbbca22 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b972a422f045..ba15fa8e709e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,13 +117,13 @@ - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 - 5.0.0-rc.1.20451.12 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 + 5.0.0-rc.1.20451.17 From 478b25d4609593c07bab37969641631f461ebb16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 07:05:38 -0700 Subject: [PATCH 212/214] Update dependencies from https://github.com/dotnet/roslyn build 20200902.1 (#13321) Microsoft.Net.Compilers.Toolset From Version 3.8.0-3.20451.2 -> To Version 3.8.0-3.20452.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 926fec42a04c..58cccb8aeebf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,9 +61,9 @@ https://github.com/dotnet/fsharp 068ebd3c599bc5a47163a18b8b90d2fe5517186e - + https://github.com/dotnet/roslyn - 0b7c260d73d9735f1179cda473739857057164ab + 33457b20f638f64b56ed9b9517926d7f36eb7321 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ba15fa8e709e..56f4f6aa900b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ - 3.8.0-3.20451.2 + 3.8.0-3.20452.1 From 67b05a26c70a6443199260cf5a4c034d34bc015d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 15:50:25 +0000 Subject: [PATCH 213/214] Update dependencies from https://github.com/microsoft/vstest build 20200902-05 (#13326) [release/5.0.1xx] Update dependencies from microsoft/vstest - Updates: - Microsoft.NET.Test.Sdk: from 16.8.0-release-20200828-02 to 16.8.0-release-20200902-05 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58cccb8aeebf..48dc7e9eb7dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,9 +81,9 @@ https://github.com/NuGet/NuGet.Client 3501ddedc274ac10d4b135856b7593a6bb8a72f1 - + https://github.com/microsoft/vstest - 4fcacb284064e66e670689b9888c0c438b1f4154 + 0c0fafa64de5c73981e7c40a99d7363f57635f60 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 56f4f6aa900b..806f6ed297d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,7 +64,7 @@ - 16.8.0-release-20200828-02 + 16.8.0-release-20200902-05 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 69d301a57254028719f23907925d9a2bc3af1e6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 11:32:07 -0700 Subject: [PATCH 214/214] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200902.2 (#13330) Microsoft.WindowsDesktop.App.Runtime.win-x64 , Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App From Version 5.0.0-rc.1.20451.14 -> To Version 5.0.0-rc.1.20452.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates From Version 5.0.0-rc.1.20451.4 -> To Version 5.0.0-rc.1.20451.6 (parent: Microsoft.WindowsDesktop.App Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48dc7e9eb7dc..1b8bbd7db39a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,29 +105,29 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/windowsdesktop - 3b198e9a3edaf7e183580e1d95d720d03f944447 + 9ea6951cdc8e275e30901a51be700e88d03c4bb9 - + https://github.com/dotnet/windowsdesktop - 3b198e9a3edaf7e183580e1d95d720d03f944447 + 9ea6951cdc8e275e30901a51be700e88d03c4bb9 - + https://github.com/dotnet/windowsdesktop - 3b198e9a3edaf7e183580e1d95d720d03f944447 + 9ea6951cdc8e275e30901a51be700e88d03c4bb9 - + https://github.com/dotnet/wpf - 48bea1ca59aae317957fea2d573395ee9edc21d4 + be89bbfaded6ad3f0f4143bf1a8dd075a5789715 - + https://github.com/dotnet/wpf - 48bea1ca59aae317957fea2d573395ee9edc21d4 + be89bbfaded6ad3f0f4143bf1a8dd075a5789715 - + https://github.com/dotnet/winforms - 8c52921c5371cfb864442491a8d89739296a75f2 + 97d99ec9e047dcdff90185bfd0bbe9f26b7be62f https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 806f6ed297d5..62d1fb7fcf68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,11 +127,11 @@ - 5.0.0-rc.1.20451.4 + 5.0.0-rc.1.20451.6 - 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20452.2