From 2195668cc49a4d0166ca15858cd3918b3cbf389b Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 15 Jul 2020 13:44:35 -0700 Subject: [PATCH 001/140] Update channel --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 9bd214aa9..fd434b81e 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - master + release/5.0.1xx-preview8 From 1f89708b1cdd926b02bdfe8d6975769cdfb006b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2020 01:19:13 +0000 Subject: [PATCH 002/140] Update dependencies from https://github.com/dotnet/arcade build 20200714.3 (#7997) Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20330.3 -> To Version 5.0.0-beta.20364.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 +- eng/common/SetupNugetSources.ps1 | 12 +-- eng/common/SetupNugetSources.sh | 49 ++++++------ eng/common/performance/performance-setup.ps1 | 5 ++ eng/common/performance/performance-setup.sh | 4 + eng/common/post-build/symbols-validation.ps1 | 2 +- eng/common/templates/job/job.yml | 12 +++ .../channels/generic-internal-channel.yml | 4 + .../templates/post-build/post-build.yml | 76 +++++++++++-------- eng/common/tools.ps1 | 2 +- global.json | 2 +- 11 files changed, 105 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fcaf18b1..b8406fb9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,9 +104,9 @@ - + https://github.com/dotnet/arcade - 243cc92161ad44c2a07464425892daee19121c99 + ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index c3c473eb8..dc2217812 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -128,16 +128,16 @@ $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password -$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") -if ($dotnet3Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password -} - $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']") +if ($dotnet5Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 7d6fef27f..f33e37711 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -79,31 +79,6 @@ fi PackageSources=() -# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present -grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3-internal') - - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3-internal-transport') -fi - # Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet5-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet5-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet5-internal-transport') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 31a99e490..656c0bd90 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -54,6 +54,11 @@ if ($Internal) { $HelixSourcePrefix = "official" } +if($MonoInterpreter) +{ + $ExtraBenchmarkDotNetArguments = "--category-exclusion-filter NoInterpreter" +} + if($MonoDotnet -ne "") { $Configurations += " LLVM=$LLVM MonoInterpreter=$MonoInterpreter MonoAOT=$MonoAOT" diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 9409e4d85..c87cbf0fc 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -191,6 +191,10 @@ if [[ "$mono_dotnet" != "" ]]; then configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot" fi +if [[ "$monointerpreter" == "true" ]]; then + 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" 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/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index 495428ea2..a36fa6f26 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -144,7 +144,7 @@ $CountMissingSymbols = { if ($MissingSymbols -ne 0) { - Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $FileName" + Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath" } Pop-Location diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c08bb416d..e78ed9a1c 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -65,6 +65,9 @@ jobs: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -124,6 +127,15 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: 'csharp' + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + continueOnError: true + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 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 258ba4b77..12db36ebe 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -35,6 +35,10 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Build Assets continueOnError: true diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 07fc2e982..0e79a546b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -46,15 +46,16 @@ parameters: NETCoreExperimentalChannelId: 562 NetEngServicesIntChannelId: 678 NetEngServicesProdChannelId: 679 - Net5Preview5ChannelId: 857 - Net5Preview6ChannelId: 1013 Net5Preview7ChannelId: 1065 + Net5Preview8ChannelId: 1155 + Net5RC1ChannelId: 1157 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 NetCoreSDK314xxChannelId: 921 NetCoreSDK314xxInternalChannelId: 922 VS166ChannelId: 1010 VS167ChannelId: 1011 + VS168ChannelId: 1154 VSMasterChannelId: 1012 stages: @@ -114,7 +115,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.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VSMasterChannelId}} + -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}} - job: displayName: NuGet Validation @@ -269,34 +270,6 @@ 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: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview5_Publish' - channelName: '.NET 5 Preview 5' - akaMSChannelName: 'net5/preview5' - channelId: ${{ parameters.Net5Preview5ChannelId }} - 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: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - dependsOn: ${{ parameters.publishDependsOn }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - stageName: 'Net5_Preview6_Publish' - channelName: '.NET 5 Preview 6' - akaMSChannelName: 'net5/preview6' - channelId: ${{ parameters.Net5Preview6ChannelId }} - 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: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -311,6 +284,34 @@ 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-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview8_Publish' + channelName: '.NET 5 Preview 8' + akaMSChannelName: 'net5/preview8' + channelId: ${{ parameters.Net5Preview8ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' + + - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_RC1_Publish' + channelName: '.NET 5 RC 1' + akaMSChannelName: 'net5/rc1' + channelId: ${{ parameters.Net5RC1ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} @@ -509,6 +510,19 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'VS16_8_Publishing' + channelName: 'VS 16.8' + channelId: ${{ parameters.VS168ChannelId }} + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d68684e2a..6f8bc4111 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -385,7 +385,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Create-Directory $packageDir Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath Unzip $packagePath $packageDir } diff --git a/global.json b/global.json index f634d1018..05e261d5f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20330.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3" } } From 523178d7c68b2ac0fb60d38599e4cbc62f6a381d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 16 Jul 2020 08:21:23 -0700 Subject: [PATCH 003/140] Enable builds of internal branches (#8007) --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a8a0ca6e4..e2bdec6ea 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -5,6 +5,7 @@ trigger: - master - release/* - internal/release/3.* + - internal/release/5.* variables: # These two variables are used by CopyToLatest. From f808e580a414f4174eaf1b8658d90f9576e67009 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Jul 2020 12:50:32 -0700 Subject: [PATCH 004/140] Fixup pools (#8024) (#8025) * Fixup pools and move to 2019 queues * Fixup queues * Revert publish build assets to hosted --- .vsts-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e2bdec6ea..05e608cd5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -41,9 +41,10 @@ stages: parameters: agentOs: Windows_NT pool: - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - vmImage: vs2017-win2016 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCorePublic-Pool + queue: buildpool.windows.10.amd64.vs2017.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool queue: buildpool.windows.10.amd64.vs2017 timeoutInMinutes: 180 From c4f06ea1f9cb52410911ccb3aa3f5265f6a9ac07 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Jul 2020 16:29:14 -0700 Subject: [PATCH 005/140] Pass some other variables to dockerrun (#8009) (#8026) These are used in publishing to populate manifest metadata. Arcade now requires that the metadata is consistent across each manifest. --- eng/dockerrun.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh index 819858ea2..f2ef9f914 100755 --- a/eng/dockerrun.sh +++ b/eng/dockerrun.sh @@ -162,8 +162,11 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e BUILD_REPOSITORY_URI \ -e BUILD_SOURCEBRANCH \ -e BUILD_BUILDNUMBER \ + -e BUILD_BUILDID \ -e BUILD_SOURCEVERSION \ -e SYSTEM_TEAMPROJECT \ + -e SYSTEM_DEFINITIONID \ + -e SYSTEM_TEAMFOUNDATIONCOLLECTIONURI \ -e DOTNETCLIMSRC_READ_SAS_TOKEN \ -e AGENT_JOBNAME \ -e AGENT_OS \ From a7cf77dd667e4fd560083bc1acbbe02c60c74b89 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 16 Jul 2020 13:38:34 -0700 Subject: [PATCH 006/140] Publish the SDK sentinel package as a package (#8012) --- eng/Publishing.props | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index 568312d2e..de5617d4f 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -50,9 +50,11 @@ $(AssetManifestFileName)-$(AGENT_JOBNAME) $(AssetManifestFileName)-$(Architecture) $(AssetManifestFileName)-checksums + $(AssetManifestFileName)-packages $(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml $(ArtifactsLogDir)AssetManifest\$(ChecksumsAssetManifestFileName).xml + $(ArtifactsLogDir)AssetManifest\$(PackagesManifestFileName).xml $(ArtifactsDir)..\DotnetAssetsTmpDir\$([System.Guid]::NewGuid()) $(ArtifactsDir)..\ChecksumAssetsTmpDir\$([System.Guid]::NewGuid()) @@ -74,6 +76,7 @@ Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'" /> + @@ -84,6 +87,7 @@ + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) NonShipping=true + + + NonShipping=true + $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) @@ -165,5 +173,16 @@ ManifestCommit="$(BUILD_SOURCEVERSION)" AssetManifestPath="$(ChecksumsAssetManifestFilePath)" PublishFlatContainer="true" /> + + + From 7e76b75c653b74dd9525bfa7b586a398fa5b4a7d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 17 Jul 2020 08:44:45 -0700 Subject: [PATCH 007/140] Only publish Microsoft.DotNet.Sdk.Internal once (#8016) Otherwise we run into a publishing check that ensures that there are no duplicates. Also don't push if the packages itemgroup is empty --- eng/Publishing.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index de5617d4f..9999c71ee 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -87,7 +87,7 @@ - + + PublishFlatContainer="false" + Condition="'@(SdkPackagesToPush)' != ''" /> From c5292aab9078e465abba6b11d18273759cd0e7e8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 5 Aug 2020 09:44:21 -0700 Subject: [PATCH 008/140] [release/5.0.1xx-preview8] Port Microsoft.DotNet.Sdk.Internal fixes from master (#8105) * Revert "Only publish Microsoft.DotNet.Sdk.Internal once (#8016)" This reverts commit 7e76b75c653b74dd9525bfa7b586a398fa5b4a7d. * Revert "Publish the SDK sentinel package as a package (#8012)" This reverts commit a7cf77dd667e4fd560083bc1acbbe02c60c74b89. * Fix asset manifest file names. Set the asset manifest OS and change the name of the installers manifests. Currently arcade defaults to using OS-Platform as the asset manifest file name. Installer does a ton of building in docker containers, which ends up generating many overlapping names. This is a symptom and also likely hiding some non-determinsm. To fix, change the name of the blob asset manifest name to include a "-installers" suffix. Then alter the property names around a bit so that AssetManifestOS is set prior to publish.proj's publish target being run. --- eng/Publishing.props | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 9999c71ee..99e07962f 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,18 +43,19 @@ - $(AGENT_OS) - $(OS) - $(AssetManifestFileName)-$(AGENT_JOBNAME) - $(AssetManifestFileName)-$(Architecture) - $(AssetManifestFileName)-checksums - $(AssetManifestFileName)-packages - - $(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml + that exists in the container. Disambiguate the manifests via available properties. + AGENT_OS and AGENT_JOBNAME are present on Azure DevOps agents. AssetManifestOS will also + be used by arcade to generate the name of the manifest file name for the built in publishing. --> + $(AGENT_OS) + $(OS) + $(AssetManifestOS)-$(AGENT_JOBNAME) + $(AssetManifestOS) + $(AssetManifestOS)-$(Architecture) + $(BaseAssetManifestFileName)-installers + $(BaseAssetManifestFileName)-checksums + + $(ArtifactsLogDir)AssetManifest\$(InstallersAssetManifestFileName).xml $(ArtifactsLogDir)AssetManifest\$(ChecksumsAssetManifestFileName).xml - $(ArtifactsLogDir)AssetManifest\$(PackagesManifestFileName).xml $(ArtifactsDir)..\DotnetAssetsTmpDir\$([System.Guid]::NewGuid()) $(ArtifactsDir)..\ChecksumAssetsTmpDir\$([System.Guid]::NewGuid()) @@ -76,7 +77,6 @@ Condition=" '$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'" /> - @@ -87,7 +87,6 @@ - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) NonShipping=true - - - NonShipping=true - $(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)')) @@ -161,7 +156,7 @@ ManifestBranch="$(BUILD_SOURCEBRANCH)" ManifestBuildId="$(BUILD_BUILDNUMBER)" ManifestCommit="$(BUILD_SOURCEVERSION)" - AssetManifestPath="$(DotNetAssetManifestFilePath)" + AssetManifestPath="$(InstallersAssetManifestFilePath)" PublishFlatContainer="true" /> - - - From 3531985df7731d4b5feb142024dd388c82b8255f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Fri, 7 Aug 2020 16:51:20 +0200 Subject: [PATCH 009/140] Update dependencies from https://github.com/dotnet/test-templates build 20200807.5 (#8123) Microsoft.DotNet.Test.ProjectTemplates.2.1 , Microsoft.DotNet.Test.ProjectTemplates.5.0 From Version 1.0.2-beta4.20303.2 -> To Version 1.0.2-beta4.20407.5 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 b8406fb9f..1eba87d35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/aspnetcore fae3dd12aeba7c9995f69bfaa1c9b74d82307ef1 - + https://github.com/dotnet/test-templates - 6865397797d0e0c36d8db45a4ea5f916ce616b9c + 345cad2a4a3f7dffd53104cb1aa3d582faafb85d - + https://github.com/dotnet/test-templates - 6865397797d0e0c36d8db45a4ea5f916ce616b9c + 345cad2a4a3f7dffd53104cb1aa3d582faafb85d https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index aa5878007..ee1ecd027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 1.0.2-beta4.20303.2 + 1.0.2-beta4.20407.5 @@ -113,7 +113,7 @@ 1.5.3 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 1.0.2-beta4.20303.2 + 1.0.2-beta4.20407.5 2.1.14 From 05203da2811b42ecddc2d6f4b995d44925be3945 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 11 Aug 2020 11:07:31 -0700 Subject: [PATCH 010/140] Ensure rzc.dll and PresentationBuildTasks.dll are signed after running crossgen --- src/redist/targets/Signing.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index f2bb0e708..8a19cab96 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -108,6 +108,8 @@ $(SdkOutputDirectory)**/datacollector.exe; $(SdkOutputDirectory)**/MSBuild.dll; $(SdkOutputDirectory)**/MSBuild.resources.dll; + $(SdkOutputDirectory)**/PresentationBuildTasks.dll; + $(SdkOutputDirectory)**/rzc.dll; $(SdkOutputDirectory)**/testhost.dll; $(SdkOutputDirectory)**/testhost.exe; $(SdkOutputDirectory)**/testhost.x86.exe; From 122e287a55ddebba5bd09fc642f3d39633fac155 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 13 Aug 2020 17:18:26 -0700 Subject: [PATCH 011/140] Update implicit version for 3.1 runtime --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index ded050f88..7c6f72967 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -31,7 +31,7 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.2 + <_NETCoreApp31RuntimePackVersion>3.1.7 <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.3 From 91bf9b371ca850eb56d94be84fbf8b790ab7c4ec Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 13 Aug 2020 21:25:50 -0700 Subject: [PATCH 012/140] Update min VS version in installer info (#8157) --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1033/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index 7e012fb66..004138691 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -75,7 +75,7 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若預計要併用 Visual Studio 與 .NET 5.0，需要 Visual Studio 2019 16.6 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>。 + 若預計要併用 Visual Studio 與 .NET 5.0，需要 Visual Studio 2019 16.8 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>。 按一下 [\[]安裝[\[] 即表示您同意下列條款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index cbb38ce5a..d190f3138 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -75,7 +75,7 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud plánujete používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.6 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A> + Pokud plánujete používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.8 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A> Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index 6204865e6..fb193fb93 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -75,7 +75,7 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.6 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Erfahren Sie mehr</A>. + Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.8 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Erfahren Sie mehr</A>. Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index 1b31893d6..2e3e86df2 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -75,7 +75,7 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. <A HREF="https://aka.ms/dotnet5-release-notes">Learn More</A>. + If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.8 or newer is required. <A HREF="https://aka.ms/dotnet5-release-notes">Learn More</A>. By clicking Install, you agree to the following terms. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index a89057cdc..38cc06a3d 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -75,7 +75,7 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.6 ou version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. + Si vous comptez utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.8 ou version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. En cliquant sur Installer, vous acceptez les conditions suivantes. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index d2d8d5a74..4e9dc4b4a 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -75,7 +75,7 @@ Risorse Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si intende usare .NET 5.0 con Visual Studio, è richiesto Visual Studio 2019 16.6 o versione successiva. <A HREF="https://aka.ms/dotnet5-release-notes">Altre informazioni</A>. + Se si intende usare .NET 5.0 con Visual Studio, è richiesto Visual Studio 2019 16.8 o versione successiva. <A HREF="https://aka.ms/dotnet5-release-notes">Altre informazioni</A>. Facendo clic su Installa, si accettano le condizioni seguenti. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 0a681a0b5..6bdfe68ff 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -75,7 +75,7 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .NET 5.0 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.6 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 + .NET 5.0 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.8 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 [インストール] をクリックすると、次の条項に同意したものと見なされます。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index 856fd5ef5..99a59349c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -75,7 +75,7 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio와 함께 .NET 5.0을 사용하려면 Visual Studio 2019 16.6 이상이 필요합니다. <A HREF="https://aka.ms/dotnet5-release-notes">자세한 정보</A>. + Visual Studio와 함께 .NET 5.0을 사용하려면 Visual Studio 2019 16.8 이상이 필요합니다. <A HREF="https://aka.ms/dotnet5-release-notes">자세한 정보</A>. [설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index 4659ee8f0..c22a5a48e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -75,7 +75,7 @@ Zasoby Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET 5.0 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.6 lub nowszy. <A HREF="https://aka.ms/dotnet5-release-notes">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET 5.0 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.8 lub nowszy. <A HREF="https://aka.ms/dotnet5-release-notes">Dowiedz się więcej</A>. Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index 82efc3ac3..c405afb11 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -75,7 +75,7 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2019 16.6 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. + Se você planeja usar o .NET 5.0 com o Visual Studio, é necessário usar o Visual Studio 2019 16.8 ou mais recente. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. Ao clicar em instalar, você concorda com os termos a seguir. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index ddd9fbc44..e79c2aa1f 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -75,7 +75,7 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET 5.0 с Visual Studio, требуется Visual Studio 2019 версии 16.6 или более поздней. <A HREF="https://aka.ms/dotnet5-release-notes">Дополнительные сведения</A>. + Если вы планируете использовать .NET 5.0 с Visual Studio, требуется Visual Studio 2019 версии 16.8 или более поздней. <A HREF="https://aka.ms/dotnet5-release-notes">Дополнительные сведения</A>. Нажимая кнопку "Установить", вы принимаете следующие условия. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index dd0b3990b..f80a96737 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -75,7 +75,7 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.6 veya daha yeni bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.8 veya daha yeni bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index e8a496d0c..d3e6e3568 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -75,7 +75,7 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果计划结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.6 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 + 如果计划结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.8 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 单击“安装”即表示你同意以下条款。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index 961ff139b..d70eaa727 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -75,7 +75,7 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.6 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Más información</A>. + Si tiene previsto usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.8 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Más información</A>. Al hacer clic en Instalar, acepta los términos siguientes. From ad6a4b6f56c045d715a60288a054d55a9b13d637 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 14 Aug 2020 08:58:20 -0700 Subject: [PATCH 013/140] Update implicit version for 3.1 runtime (#8164) --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index ded050f88..7c6f72967 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -31,7 +31,7 @@ <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_NETCoreApp31RuntimePackVersion>3.1.2 + <_NETCoreApp31RuntimePackVersion>3.1.7 <_NETCoreApp31TargetingPackVersion>3.1.0 <_WindowsDesktop30RuntimePackVersion>3.0.3 From 221f59d64a0904ae44f39ccbbdddce3301cfbdf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Aug 2020 22:47:17 +0000 Subject: [PATCH 014/140] Update dependencies from https://github.com/dotnet/sdk build 20200820.11 (#8222) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.8 to 5.0.100-rc.1.20420.11 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.8 to 5.0.100-rc.1.20420.11 --- 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 247ce5334..cb9634eb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 4bc03d190c8bb5acfac9043f8af1f5a953a2e894 + 9527952fe17843d6b5f132ae7091e4a44e057834 - + https://github.com/dotnet/sdk - 4bc03d190c8bb5acfac9043f8af1f5a953a2e894 + 9527952fe17843d6b5f132ae7091e4a44e057834 diff --git a/eng/Versions.props b/eng/Versions.props index 4f505393e..837d386ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20420.8 - 5.0.100-rc.1.20420.8 + 5.0.100-rc.1.20420.11 + 5.0.100-rc.1.20420.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd1cb4d57a7f8dad956642a90a1f13e5a5ee5a0a 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:37 +0000 Subject: [PATCH 015/140] Update dependencies from https://github.com/dotnet/sdk build 20200820.14 (#8225) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.1.20420.13 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.11 to 5.0.100-rc.1.20420.14 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.11 to 5.0.100-rc.1.20420.14 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb9634eb4..b96282ce3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 9527952fe17843d6b5f132ae7091e4a44e057834 + c2b3eeff5c7a61e044cab746a7468df84e529ab4 - + https://github.com/dotnet/sdk - 9527952fe17843d6b5f132ae7091e4a44e057834 + c2b3eeff5c7a61e044cab746a7468df84e529ab4 diff --git a/eng/Versions.props b/eng/Versions.props index 837d386ef..81586c5ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20420.11 - 5.0.100-rc.1.20420.11 + 5.0.100-rc.1.20420.14 + 5.0.100-rc.1.20420.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ff5aae95e63b4c43cd92720fc769ef1dbf99b3c 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:49:51 +0000 Subject: [PATCH 016/140] Update dependencies from https://github.com/dotnet/sdk build 20200820.15 (#8226) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.1 to 5.0.0-rc.1.20417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20417.3 to 5.0.0-rc.1.20420.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.14 to 5.0.100-rc.1.20420.15 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.14 to 5.0.100-rc.1.20420.15 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.1 to 5.0.0-rc.1.20417.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 5.0.0-rc.1.20420.4 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20417.3 to 5.0.0-rc.1.20420.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b96282ce3..c529d5b5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - c2b3eeff5c7a61e044cab746a7468df84e529ab4 + f3c0e0fb78459e76249b9f617f7ba1b219c21bbe - + https://github.com/dotnet/sdk - c2b3eeff5c7a61e044cab746a7468df84e529ab4 + f3c0e0fb78459e76249b9f617f7ba1b219c21bbe - + https://github.com/dotnet/winforms - b014c89fafff342c92c27968f8231b5032b12954 + 6d1700bfaa99dad3a903df693d1f7b00dca18acc - + https://github.com/dotnet/wpf - b91ba697c48bc7825580e3c7fa09c5c3781c3788 + ad3a13c51d250df882d3106e7db4d4606073a7f5 diff --git a/eng/Versions.props b/eng/Versions.props index 81586c5ce..0c1325892 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20417.1 + 5.0.0-rc.1.20417.2 - 5.0.0-rc.1.20417.3 + 5.0.0-rc.1.20420.1 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20420.14 - 5.0.100-rc.1.20420.14 + 5.0.100-rc.1.20420.15 + 5.0.100-rc.1.20420.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 - 5.0.0-rc.1.20417.4 + 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20420.4 From 8dca70593d81838209c7b9a709968b9aea75868b 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:43:42 +0000 Subject: [PATCH 017/140] Update dependencies from https://github.com/dotnet/sdk build 20200820.17 (#8228) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.15 to 5.0.100-rc.1.20420.17 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.15 to 5.0.100-rc.1.20420.17 --- 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 c529d5b5a..3cdfc5e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - f3c0e0fb78459e76249b9f617f7ba1b219c21bbe + e68bdca84d18b12a223f3618b780d85dc6ba9b24 - + https://github.com/dotnet/sdk - f3c0e0fb78459e76249b9f617f7ba1b219c21bbe + e68bdca84d18b12a223f3618b780d85dc6ba9b24 diff --git a/eng/Versions.props b/eng/Versions.props index 0c1325892..7cf06465f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20420.15 - 5.0.100-rc.1.20420.15 + 5.0.100-rc.1.20420.17 + 5.0.100-rc.1.20420.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3d4f12fcbca152a199d40c93b4242ba5d705020 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 05:18:56 +0000 Subject: [PATCH 018/140] Update dependencies from https://github.com/dotnet/sdk build 20200820.18 (#8229) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20420.13 to 5.0.0-rc.1.20420.16 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.17 to 5.0.100-rc.1.20420.18 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.17 to 5.0.100-rc.1.20420.18 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cdfc5e8a..1ea49abba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - e68bdca84d18b12a223f3618b780d85dc6ba9b24 + a56cb4c63e43ae43a8c065f69a3c1e036a033aa0 - + https://github.com/dotnet/sdk - e68bdca84d18b12a223f3618b780d85dc6ba9b24 + a56cb4c63e43ae43a8c065f69a3c1e036a033aa0 diff --git a/eng/Versions.props b/eng/Versions.props index 7cf06465f..12b2c9314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20420.17 - 5.0.100-rc.1.20420.17 + 5.0.100-rc.1.20420.18 + 5.0.100-rc.1.20420.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 31aee7ae431031deae3bbc85f2f017cebeaba032 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:13:31 +0000 Subject: [PATCH 019/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.1 (#8230) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20420.16 to 5.0.0-rc.1.20420.18 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.18 to 5.0.100-rc.1.20421.1 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.18 to 5.0.100-rc.1.20421.1 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ea49abba..d7fead979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - a56cb4c63e43ae43a8c065f69a3c1e036a033aa0 + c1c11f471778fb6a80fe04ce95088c0ac53b6e18 - + https://github.com/dotnet/sdk - a56cb4c63e43ae43a8c065f69a3c1e036a033aa0 + c1c11f471778fb6a80fe04ce95088c0ac53b6e18 diff --git a/eng/Versions.props b/eng/Versions.props index 12b2c9314..0737a47d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20420.18 - 5.0.100-rc.1.20420.18 + 5.0.100-rc.1.20421.1 + 5.0.100-rc.1.20421.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37a2ff8f1454c50d74fea079f3351ade75f0e7f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 09:10:31 +0000 Subject: [PATCH 020/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.2 (#8232) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.1 to 5.0.100-rc.1.20421.2 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.1 to 5.0.100-rc.1.20421.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 d7fead979..408e7d69a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - c1c11f471778fb6a80fe04ce95088c0ac53b6e18 + 39b1519127233c1db9ab6ffae8ac2a1305ee6c2f - + https://github.com/dotnet/sdk - c1c11f471778fb6a80fe04ce95088c0ac53b6e18 + 39b1519127233c1db9ab6ffae8ac2a1305ee6c2f diff --git a/eng/Versions.props b/eng/Versions.props index 0737a47d7..21a613148 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.1 - 5.0.100-rc.1.20421.1 + 5.0.100-rc.1.20421.2 + 5.0.100-rc.1.20421.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65080651f623e8020e220298bba91f175e41e4e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 13:00:23 +0000 Subject: [PATCH 021/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.4 (#8233) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.2 to 5.0.100-rc.1.20421.4 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.2 to 5.0.100-rc.1.20421.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 408e7d69a..7f941953a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 39b1519127233c1db9ab6ffae8ac2a1305ee6c2f + 6e333bba63cc608cc6eda2c0ee57b56f9b987972 - + https://github.com/dotnet/sdk - 39b1519127233c1db9ab6ffae8ac2a1305ee6c2f + 6e333bba63cc608cc6eda2c0ee57b56f9b987972 diff --git a/eng/Versions.props b/eng/Versions.props index 21a613148..72906d71b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.2 - 5.0.100-rc.1.20421.2 + 5.0.100-rc.1.20421.4 + 5.0.100-rc.1.20421.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c97f437b19eb6453ff1f96a8a8f32b962614946d 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:07:25 +0000 Subject: [PATCH 022/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.7 (#8236) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.4 to 5.0.100-rc.1.20421.7 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.4 to 5.0.100-rc.1.20421.7 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 - dotnet-dev-certs: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 - dotnet-user-secrets: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 - dotnet-watch: from 5.0.0-rc.1.20420.18 to 5.0.0-rc.1.20420.22 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f941953a..2c7f86866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 6e333bba63cc608cc6eda2c0ee57b56f9b987972 + 1e822d6b1e45ce936231d18a29fd316c6bb0d95b - + https://github.com/dotnet/sdk - 6e333bba63cc608cc6eda2c0ee57b56f9b987972 + 1e822d6b1e45ce936231d18a29fd316c6bb0d95b diff --git a/eng/Versions.props b/eng/Versions.props index 72906d71b..6bdc0002b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20421.4 - 5.0.100-rc.1.20421.4 + 5.0.100-rc.1.20421.7 + 5.0.100-rc.1.20421.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 64e73725f5a6e009c6cff16f159b11a4f3f13ea6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 17:33:56 +0000 Subject: [PATCH 023/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.10 (#8237) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.7 to 5.0.100-rc.1.20421.10 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.7 to 5.0.100-rc.1.20421.10 --- 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 2c7f86866..7c878451b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 1e822d6b1e45ce936231d18a29fd316c6bb0d95b + c4d0e1ec51d432f2134a0bb918171a7e97dfa76c - + https://github.com/dotnet/sdk - 1e822d6b1e45ce936231d18a29fd316c6bb0d95b + c4d0e1ec51d432f2134a0bb918171a7e97dfa76c diff --git a/eng/Versions.props b/eng/Versions.props index 6bdc0002b..2d1b185e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.7 - 5.0.100-rc.1.20421.7 + 5.0.100-rc.1.20421.10 + 5.0.100-rc.1.20421.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 65b7c03410b471c9206aabaa2f1379b1af44a3b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 18:53:04 +0000 Subject: [PATCH 024/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.12 (#8240) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.10 to 5.0.100-rc.1.20421.12 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.10 to 5.0.100-rc.1.20421.12 --- 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 7c878451b..840dbdb1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - c4d0e1ec51d432f2134a0bb918171a7e97dfa76c + 36889dd0655563289d289ab7ebdd3e1178582808 - + https://github.com/dotnet/sdk - c4d0e1ec51d432f2134a0bb918171a7e97dfa76c + 36889dd0655563289d289ab7ebdd3e1178582808 diff --git a/eng/Versions.props b/eng/Versions.props index 2d1b185e2..fa1ac31f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.10 - 5.0.100-rc.1.20421.10 + 5.0.100-rc.1.20421.12 + 5.0.100-rc.1.20421.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e2fb0b0ff92b26f80b2431d86795ff83965b254 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 19:59:56 +0000 Subject: [PATCH 025/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.13 (#8241) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20420.1 to 5.0.0-rc.1.20420.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.12 to 5.0.100-rc.1.20421.13 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.12 to 5.0.100-rc.1.20421.13 - 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.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20420.6 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20420.1 to 5.0.0-rc.1.20420.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 840dbdb1e..018e6395a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 36889dd0655563289d289ab7ebdd3e1178582808 + 2c57cbf7e04746029dfcab00494d224c8138e87f - + https://github.com/dotnet/sdk - 36889dd0655563289d289ab7ebdd3e1178582808 + 2c57cbf7e04746029dfcab00494d224c8138e87f https://github.com/dotnet/winforms 6d1700bfaa99dad3a903df693d1f7b00dca18acc - + https://github.com/dotnet/wpf - ad3a13c51d250df882d3106e7db4d4606073a7f5 + 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 diff --git a/eng/Versions.props b/eng/Versions.props index fa1ac31f8..0acbc6d69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-rc.1.20420.1 + 5.0.0-rc.1.20420.4 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.12 - 5.0.100-rc.1.20421.12 + 5.0.100-rc.1.20421.13 + 5.0.100-rc.1.20421.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20420.4 - 5.0.0-rc.1.20420.4 - 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20420.6 + 5.0.0-rc.1.20420.6 + 5.0.0-rc.1.20420.6 From ab8c6e9c907e9b1836869d6b4592e9f67cfedec4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Aug 2020 23:03:53 +0000 Subject: [PATCH 026/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.15 (#8242) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.13 to 5.0.100-rc.1.20421.15 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.13 to 5.0.100-rc.1.20421.15 --- 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 018e6395a..859dda490 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 6a10ce799f42102bee8f8bec9a52c42cca6ed272 - + https://github.com/dotnet/sdk - 2c57cbf7e04746029dfcab00494d224c8138e87f + a2e13a92f287b2ab596aab8fda65c44718466d6b - + https://github.com/dotnet/sdk - 2c57cbf7e04746029dfcab00494d224c8138e87f + a2e13a92f287b2ab596aab8fda65c44718466d6b diff --git a/eng/Versions.props b/eng/Versions.props index 0acbc6d69..b590e50bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.13 - 5.0.100-rc.1.20421.13 + 5.0.100-rc.1.20421.15 + 5.0.100-rc.1.20421.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6d02c744564bf9f6b8a293cf8d1d9ca78ae37f6 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:32:31 +0000 Subject: [PATCH 027/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.19 (#8246) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 5.0.0-rc.1.20421.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.15 to 5.0.100-rc.1.20421.19 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.15 to 5.0.100-rc.1.20421.19 - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 5.0.0-rc.1.20421.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 859dda490..97c78a013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,17 +75,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 6a10ce799f42102bee8f8bec9a52c42cca6ed272 + 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - a2e13a92f287b2ab596aab8fda65c44718466d6b + 621997f9a5bb7c47ead3f44c9f8300f6a2f5434c - + https://github.com/dotnet/sdk - a2e13a92f287b2ab596aab8fda65c44718466d6b + 621997f9a5bb7c47ead3f44c9f8300f6a2f5434c diff --git a/eng/Versions.props b/eng/Versions.props index b590e50bc..161790188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.1.20419.1 + 5.0.0-rc.1.20421.3 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.15 - 5.0.100-rc.1.20421.15 + 5.0.100-rc.1.20421.19 + 5.0.100-rc.1.20421.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3547d9a40485edc06db1d8b61da0360826df75b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 04:22:40 +0000 Subject: [PATCH 028/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.20 (#8247) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20420.22 to 5.0.0-rc.1.20421.8 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.19 to 5.0.100-rc.1.20421.20 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.19 to 5.0.100-rc.1.20421.20 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97c78a013..f70ef34c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 907f7da59b40c80941b02ac2a46650adf3f606bc - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 621997f9a5bb7c47ead3f44c9f8300f6a2f5434c + 9e152f2ac0bcdbfbec717efd12b5b4d3e8debf92 - + https://github.com/dotnet/sdk - 621997f9a5bb7c47ead3f44c9f8300f6a2f5434c + 9e152f2ac0bcdbfbec717efd12b5b4d3e8debf92 diff --git a/eng/Versions.props b/eng/Versions.props index 161790188..3c190112c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20421.19 - 5.0.100-rc.1.20421.19 + 5.0.100-rc.1.20421.20 + 5.0.100-rc.1.20421.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e9dffe9dccbfcbec221095286922fdcd5bb873f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 04:54:29 +0000 Subject: [PATCH 029/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.22 (#8248) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.20 to 5.0.100-rc.1.20421.22 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.20 to 5.0.100-rc.1.20421.22 --- 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 f70ef34c7..e6a7502e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 9e152f2ac0bcdbfbec717efd12b5b4d3e8debf92 + a5c3ef1f1fdbc749db30973f65b46c94b0dec877 - + https://github.com/dotnet/sdk - 9e152f2ac0bcdbfbec717efd12b5b4d3e8debf92 + a5c3ef1f1fdbc749db30973f65b46c94b0dec877 diff --git a/eng/Versions.props b/eng/Versions.props index 3c190112c..96b211cb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.20 - 5.0.100-rc.1.20421.20 + 5.0.100-rc.1.20421.22 + 5.0.100-rc.1.20421.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18e939f157075cbd83ad06f0e2451b89c7449fc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 06:46:28 +0000 Subject: [PATCH 030/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.23 (#8249) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 5.0.0-rc.1.20421.14 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.22 to 5.0.100-rc.1.20421.23 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.22 to 5.0.100-rc.1.20421.23 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6a7502e7..18cb79c9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 907f7da59b40c80941b02ac2a46650adf3f606bc + 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - a5c3ef1f1fdbc749db30973f65b46c94b0dec877 + 4327879c3bac889dc20b10acc84157393f6ab004 - + https://github.com/dotnet/sdk - a5c3ef1f1fdbc749db30973f65b46c94b0dec877 + 4327879c3bac889dc20b10acc84157393f6ab004 diff --git a/eng/Versions.props b/eng/Versions.props index 96b211cb3..ce3f22c46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20421.22 - 5.0.100-rc.1.20421.22 + 5.0.100-rc.1.20421.23 + 5.0.100-rc.1.20421.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20417.14 + 5.0.0-rc.1.20421.14 - 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.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 + 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.14 2.1.0 From 8751c37f1fc80710243394df7f50ed99157bcc5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 07:36:57 +0000 Subject: [PATCH 031/140] Update dependencies from https://github.com/dotnet/sdk build 20200821.25 (#8250) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.23 to 5.0.100-rc.1.20421.25 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.23 to 5.0.100-rc.1.20421.25 --- 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 18cb79c9c..ac46cfad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 4327879c3bac889dc20b10acc84157393f6ab004 + 8de581e6ca961c9e8234b6651cec43657ed6174f - + https://github.com/dotnet/sdk - 4327879c3bac889dc20b10acc84157393f6ab004 + 8de581e6ca961c9e8234b6651cec43657ed6174f diff --git a/eng/Versions.props b/eng/Versions.props index ce3f22c46..9a777fa89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20421.23 - 5.0.100-rc.1.20421.23 + 5.0.100-rc.1.20421.25 + 5.0.100-rc.1.20421.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5459145c8c477d7a1070aada951505e034e3dbf 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:52:02 +0000 Subject: [PATCH 032/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.1 (#8251) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20421.8 to 5.0.0-rc.1.20421.10 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20421.25 to 5.0.100-rc.1.20422.1 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20421.25 to 5.0.100-rc.1.20422.1 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac46cfad9..fd5197cf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 8de581e6ca961c9e8234b6651cec43657ed6174f + 0a3bbf6468f25706584ea92c9ce84fc1b44a6bd7 - + https://github.com/dotnet/sdk - 8de581e6ca961c9e8234b6651cec43657ed6174f + 0a3bbf6468f25706584ea92c9ce84fc1b44a6bd7 diff --git a/eng/Versions.props b/eng/Versions.props index 9a777fa89..3f52a87e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20421.25 - 5.0.100-rc.1.20421.25 + 5.0.100-rc.1.20422.1 + 5.0.100-rc.1.20422.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8859bc05d4abc6ea43b2ef9e36b7bae100d6e4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 10:30:59 +0000 Subject: [PATCH 033/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.2 (#8252) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20421.14 to 5.0.0-rc.1.20421.18 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20422.1 to 5.0.100-rc.1.20422.2 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20422.1 to 5.0.100-rc.1.20422.2 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd5197cf3..6044237d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 4ad7d85d76560f0b412d8e26b8ebe252a547fcdb + c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 0a3bbf6468f25706584ea92c9ce84fc1b44a6bd7 + e73d96f0d3b55e1e5757d47f4d6487b66d9e4da6 - + https://github.com/dotnet/sdk - 0a3bbf6468f25706584ea92c9ce84fc1b44a6bd7 + e73d96f0d3b55e1e5757d47f4d6487b66d9e4da6 diff --git a/eng/Versions.props b/eng/Versions.props index 3f52a87e2..1d771e5e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20422.1 - 5.0.100-rc.1.20422.1 + 5.0.100-rc.1.20422.2 + 5.0.100-rc.1.20422.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20421.14 + 5.0.0-rc.1.20421.18 - 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.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 + 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20421.18 2.1.0 From 3e3065e44de243fe398540916a9782fddd361138 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 11:17:38 +0000 Subject: [PATCH 034/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.4 (#8253) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20422.2 to 5.0.100-rc.1.20422.4 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20422.2 to 5.0.100-rc.1.20422.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 6044237d7..c43ad211b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - e73d96f0d3b55e1e5757d47f4d6487b66d9e4da6 + bfab73a3dc778ad744b3d44cd941db351473db69 - + https://github.com/dotnet/sdk - e73d96f0d3b55e1e5757d47f4d6487b66d9e4da6 + bfab73a3dc778ad744b3d44cd941db351473db69 diff --git a/eng/Versions.props b/eng/Versions.props index 1d771e5e2..735143cb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20422.2 - 5.0.100-rc.1.20422.2 + 5.0.100-rc.1.20422.4 + 5.0.100-rc.1.20422.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3b7d4ed7b5ed4cbc319ef3f06bef8d0902bcf624 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:39:43 +0000 Subject: [PATCH 035/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.7 (#8256) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20421.10 to 5.0.0-rc.1.20422.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20422.4 to 5.0.100-rc.1.20422.7 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20422.4 to 5.0.100-rc.1.20422.7 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c43ad211b..277b2e7c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - bfab73a3dc778ad744b3d44cd941db351473db69 + 51251a9f21656d1e275cd2410375fc8c1b195918 - + https://github.com/dotnet/sdk - bfab73a3dc778ad744b3d44cd941db351473db69 + 51251a9f21656d1e275cd2410375fc8c1b195918 diff --git a/eng/Versions.props b/eng/Versions.props index 735143cb5..245893f9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20422.4 - 5.0.100-rc.1.20422.4 + 5.0.100-rc.1.20422.7 + 5.0.100-rc.1.20422.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 81b61ce87b5db7e9168c0ff86d71b292dcaa1ad8 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:59:23 +0000 Subject: [PATCH 036/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.8 (#8257) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20422.7 to 5.0.100-rc.1.20422.8 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20422.7 to 5.0.100-rc.1.20422.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 277b2e7c4..7f03bf716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 51251a9f21656d1e275cd2410375fc8c1b195918 + 1082ff941cf5fa4b9bdff103827c16a81bb6a565 - + https://github.com/dotnet/sdk - 51251a9f21656d1e275cd2410375fc8c1b195918 + 1082ff941cf5fa4b9bdff103827c16a81bb6a565 diff --git a/eng/Versions.props b/eng/Versions.props index 245893f9e..54144be37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20422.7 - 5.0.100-rc.1.20422.7 + 5.0.100-rc.1.20422.8 + 5.0.100-rc.1.20422.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 941805385075bf06bd40cb2487e8ce7db488cc16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Aug 2020 23:02:29 -0700 Subject: [PATCH 037/140] Update dependencies from https://github.com/dotnet/sdk build 20200822.9 (#8258) Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.100-rc.1.20422.8 -> To Version 5.0.100-rc.1.20422.9 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch From Version 5.0.0-rc.1.20421.18 -> To Version 5.0.0-rc.1.20422.6 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f03bf716..150546f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5cacc6c2996fb2af2d203f2594934c95a06bc96c - + 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 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - c96c5df2ba4d891440d1dd16a774ae2f4f0b2c85 + 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 1082ff941cf5fa4b9bdff103827c16a81bb6a565 + 555efe44c424147557c4310b3ba79693b8227ee1 - + https://github.com/dotnet/sdk - 1082ff941cf5fa4b9bdff103827c16a81bb6a565 + 555efe44c424147557c4310b3ba79693b8227ee1 diff --git a/eng/Versions.props b/eng/Versions.props index 54144be37..249049a90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,34 +41,34 @@ - 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 0.2.0 - 5.0.100-rc.1.20422.8 - 5.0.100-rc.1.20422.8 + 5.0.100-rc.1.20422.9 + 5.0.100-rc.1.20422.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20421.18 + 5.0.0-rc.1.20422.6 - 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.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 + 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20422.6 2.1.0 From 259caa0aef56a4134b5564bda8cf57e9aa4c438e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 08:19:34 +0000 Subject: [PATCH 038/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.1 (#8259) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20422.9 to 5.0.100-rc.1.20423.1 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20422.9 to 5.0.100-rc.1.20423.1 --- 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 150546f47..beb0d4d87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 555efe44c424147557c4310b3ba79693b8227ee1 + b0cdca64e59eb0bce49f43d566219812b83ec209 - + https://github.com/dotnet/sdk - 555efe44c424147557c4310b3ba79693b8227ee1 + b0cdca64e59eb0bce49f43d566219812b83ec209 diff --git a/eng/Versions.props b/eng/Versions.props index 249049a90..bc5c43b25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20422.9 - 5.0.100-rc.1.20422.9 + 5.0.100-rc.1.20423.1 + 5.0.100-rc.1.20423.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 143c3049d5d6a17e490fdf185cc969134d8fac15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 10:18:41 +0000 Subject: [PATCH 039/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.2 (#8260) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20422.5 to 5.0.0-rc.1.20422.7 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.1 to 5.0.100-rc.1.20423.2 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.1 to 5.0.100-rc.1.20423.2 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beb0d4d87..53aba6c3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 977a00fb9d587a6c1292fb3af3992038ddcd3016 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - b0cdca64e59eb0bce49f43d566219812b83ec209 + aca6331bff50fc1d03e3531260a08a7ba2871fce - + https://github.com/dotnet/sdk - b0cdca64e59eb0bce49f43d566219812b83ec209 + aca6331bff50fc1d03e3531260a08a7ba2871fce diff --git a/eng/Versions.props b/eng/Versions.props index bc5c43b25..7dc29af21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20423.1 - 5.0.100-rc.1.20423.1 + 5.0.100-rc.1.20423.2 + 5.0.100-rc.1.20423.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c64855cc0e8445301a0cf5ab344acd65200b3e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 12:44:26 +0000 Subject: [PATCH 040/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.3 (#8261) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20422.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20423.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.2 to 5.0.100-rc.1.20423.3 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.2 to 5.0.100-rc.1.20423.3 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.2 to 5.0.0-rc.1.20422.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20420.6 to 5.0.0-rc.1.20423.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20420.4 to 5.0.0-rc.1.20423.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53aba6c3d..699eb25ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - aca6331bff50fc1d03e3531260a08a7ba2871fce + 5997452539d2e0f9580ce6a3bb78d525437502e3 - + https://github.com/dotnet/sdk - aca6331bff50fc1d03e3531260a08a7ba2871fce + 5997452539d2e0f9580ce6a3bb78d525437502e3 - + https://github.com/dotnet/winforms - 6d1700bfaa99dad3a903df693d1f7b00dca18acc + 3965b18be5ae602b2c430e268fcd7a7d50951a82 - + https://github.com/dotnet/wpf - 2dbfb3f231bbc5dd6cee951dd4ced496bdabb3c4 + ef7880b7a27805df56394c365c7b114847f9dd49 diff --git a/eng/Versions.props b/eng/Versions.props index 7dc29af21..0fd1ceeeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20417.2 + 5.0.0-rc.1.20422.3 - 5.0.0-rc.1.20420.4 + 5.0.0-rc.1.20423.1 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20423.2 - 5.0.100-rc.1.20423.2 + 5.0.100-rc.1.20423.3 + 5.0.100-rc.1.20423.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20420.6 - 5.0.0-rc.1.20420.6 - 5.0.0-rc.1.20420.6 + 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20423.1 From 576f618958178fd9ac61f3c4cd8628c9c05a6bc4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 14:59:52 +0000 Subject: [PATCH 041/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.5 (#8262) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.3 to 5.0.100-rc.1.20423.5 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.3 to 5.0.100-rc.1.20423.5 --- 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 699eb25ce..fd41c6d85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 5997452539d2e0f9580ce6a3bb78d525437502e3 + aab4b1da251cde171371509de7eb809581358b74 - + https://github.com/dotnet/sdk - 5997452539d2e0f9580ce6a3bb78d525437502e3 + aab4b1da251cde171371509de7eb809581358b74 diff --git a/eng/Versions.props b/eng/Versions.props index 0fd1ceeeb..ddb9e9c3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20423.3 - 5.0.100-rc.1.20423.3 + 5.0.100-rc.1.20423.5 + 5.0.100-rc.1.20423.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3fa133c688fd70c8e0a7c2c91463dcc1d9d748c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 23 Aug 2020 23:13:58 +0000 Subject: [PATCH 042/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.7 (#8263) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20422.6 to 5.0.0-rc.1.20423.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.5 to 5.0.100-rc.1.20423.7 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.5 to 5.0.100-rc.1.20423.7 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd41c6d85..97483d3fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 977a00fb9d587a6c1292fb3af3992038ddcd3016 + 3784acb2f456ac17b978f5c845806f6ea1d7c915 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - aab4b1da251cde171371509de7eb809581358b74 + 8f1b8a7a884b5948c9951ba87278e77345bac626 - + https://github.com/dotnet/sdk - aab4b1da251cde171371509de7eb809581358b74 + 8f1b8a7a884b5948c9951ba87278e77345bac626 diff --git a/eng/Versions.props b/eng/Versions.props index ddb9e9c3e..2d0559ecf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20423.5 - 5.0.100-rc.1.20423.5 + 5.0.100-rc.1.20423.7 + 5.0.100-rc.1.20423.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20422.6 + 5.0.0-rc.1.20423.4 - 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.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 + 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.4 2.1.0 From 406bd6f6ff5fe1b0fca1ff594fc0aecf10815bac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 04:10:54 +0000 Subject: [PATCH 043/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.8 (#8264) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.7 to 5.0.100-rc.1.20423.8 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.7 to 5.0.100-rc.1.20423.8 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 - dotnet-dev-certs: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 - dotnet-user-secrets: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 - dotnet-watch: from 5.0.0-rc.1.20422.7 to 5.0.0-rc.1.20423.3 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97483d3fa..b695bb76b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 - + https://github.com/dotnet/aspnetcore - cf0f7efa9c231f83e6b51b1733e65679d8c0a823 + 112d821a260b4e71c82f3bf01b3d6a5132cd12a1 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 8f1b8a7a884b5948c9951ba87278e77345bac626 + 515d87840a06abe81c90b2f40e7094004b443689 - + https://github.com/dotnet/sdk - 8f1b8a7a884b5948c9951ba87278e77345bac626 + 515d87840a06abe81c90b2f40e7094004b443689 diff --git a/eng/Versions.props b/eng/Versions.props index 2d0559ecf..38bd07806 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20423.7 - 5.0.100-rc.1.20423.7 + 5.0.100-rc.1.20423.8 + 5.0.100-rc.1.20423.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aef909ab8b31ce1ec6dc38c1778685b7c9aa33c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 06:41:27 +0000 Subject: [PATCH 044/140] Update dependencies from https://github.com/dotnet/sdk build 20200823.9 (#8265) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20423.3 to 5.0.0-rc.1.20423.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.8 to 5.0.100-rc.1.20423.9 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.8 to 5.0.100-rc.1.20423.9 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b695bb76b..0967fb553 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3784acb2f456ac17b978f5c845806f6ea1d7c915 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 515d87840a06abe81c90b2f40e7094004b443689 + 2cd2370ffa6ec52031b661594c1c4cf483cc2447 - + https://github.com/dotnet/sdk - 515d87840a06abe81c90b2f40e7094004b443689 + 2cd2370ffa6ec52031b661594c1c4cf483cc2447 diff --git a/eng/Versions.props b/eng/Versions.props index 38bd07806..ff45a6ffd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20423.8 - 5.0.100-rc.1.20423.8 + 5.0.100-rc.1.20423.9 + 5.0.100-rc.1.20423.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4e4e30cd831eb91347852320e363a5f14320b51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 11:22:46 +0000 Subject: [PATCH 045/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.1 (#8266) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20423.4 to 5.0.0-rc.1.20423.8 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20423.9 to 5.0.100-rc.1.20424.1 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20423.9 to 5.0.100-rc.1.20424.1 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0967fb553..a71955245 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3a3d0864542d0f8f1de14d9f35b18cffaf045f3b - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3784acb2f456ac17b978f5c845806f6ea1d7c915 + 9aa4e069b5e9f6a33f7304fa7d58de26424588fb https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - 2cd2370ffa6ec52031b661594c1c4cf483cc2447 + bced0b96a6e9ae3159fc8fe4bab84f3b717d14b4 - + https://github.com/dotnet/sdk - 2cd2370ffa6ec52031b661594c1c4cf483cc2447 + bced0b96a6e9ae3159fc8fe4bab84f3b717d14b4 diff --git a/eng/Versions.props b/eng/Versions.props index ff45a6ffd..b714901fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20423.9 - 5.0.100-rc.1.20423.9 + 5.0.100-rc.1.20424.1 + 5.0.100-rc.1.20424.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20423.4 + 5.0.0-rc.1.20423.8 - 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.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 + 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20423.8 2.1.0 From 7fe37066ea583ac88b828e895d794f6fc84604cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 15:00:29 +0000 Subject: [PATCH 046/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.2 (#8267) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20422.3 to 5.0.0-rc.1.20424.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.1 to 5.0.100-rc.1.20424.2 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.1 to 5.0.100-rc.1.20424.2 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20422.3 to 5.0.0-rc.1.20424.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20423.1 to 5.0.0-rc.1.20424.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a71955245..47cb80a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 8964302e878d00a0161df0ce1c42c535316e339d - + https://github.com/dotnet/sdk - bced0b96a6e9ae3159fc8fe4bab84f3b717d14b4 + 72d99cc3f02c1f2f7835bd3048a86f572d0e180e - + https://github.com/dotnet/sdk - bced0b96a6e9ae3159fc8fe4bab84f3b717d14b4 + 72d99cc3f02c1f2f7835bd3048a86f572d0e180e - + https://github.com/dotnet/winforms - 3965b18be5ae602b2c430e268fcd7a7d50951a82 + 7ad393f0e830d91b1c4ebc77500c23acb82d10bb - + https://github.com/dotnet/wpf - ef7880b7a27805df56394c365c7b114847f9dd49 + 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 diff --git a/eng/Versions.props b/eng/Versions.props index b714901fc..f27d1eae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20422.3 + 5.0.0-rc.1.20424.1 - 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20424.1 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.1 - 5.0.100-rc.1.20424.1 + 5.0.100-rc.1.20424.2 + 5.0.100-rc.1.20424.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20423.1 - 5.0.0-rc.1.20423.1 - 5.0.0-rc.1.20423.1 + 5.0.0-rc.1.20424.1 + 5.0.0-rc.1.20424.1 + 5.0.0-rc.1.20424.1 From b5e7150bc46eeb762cece2ed273f48d7be7aeff0 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:30:10 +0000 Subject: [PATCH 047/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8268) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20421.3 to 5.0.0-rc.1.20424.2 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.2 to 5.0.100-rc.1.20424.4 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.2 to 5.0.100-rc.1.20424.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - dotnet-dev-certs: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - dotnet-user-secrets: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - dotnet-watch: from 5.0.0-rc.1.20423.5 to 5.0.0-rc.1.20424.3 - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20421.3 to 5.0.0-rc.1.20424.2 --- 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 47cb80a15..136b286c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + 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/test-templates @@ -75,17 +75,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 8964302e878d00a0161df0ce1c42c535316e339d + 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 72d99cc3f02c1f2f7835bd3048a86f572d0e180e + 2820d516561f04fcfce43fd9752aa7ac364dab9f - + https://github.com/dotnet/sdk - 72d99cc3f02c1f2f7835bd3048a86f572d0e180e + 2820d516561f04fcfce43fd9752aa7ac364dab9f diff --git a/eng/Versions.props b/eng/Versions.props index f27d1eae8..83847d545 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.1.20421.3 + 5.0.0-rc.1.20424.2 @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20424.2 - 5.0.100-rc.1.20424.2 + 5.0.100-rc.1.20424.4 + 5.0.100-rc.1.20424.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae492b245ab766aac09156637b7896cdcb0d40c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Aug 2020 18:51:09 +0000 Subject: [PATCH 048/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.5 (#8269) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20424.3 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.4 to 5.0.100-rc.1.20424.5 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.4 to 5.0.100-rc.1.20424.5 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 136b286c0..870b414ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 9aa4e069b5e9f6a33f7304fa7d58de26424588fb - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 2820d516561f04fcfce43fd9752aa7ac364dab9f + 1df1eafb50a190e14b8d0efd761e394f391fde6c - + https://github.com/dotnet/sdk - 2820d516561f04fcfce43fd9752aa7ac364dab9f + 1df1eafb50a190e14b8d0efd761e394f391fde6c diff --git a/eng/Versions.props b/eng/Versions.props index 83847d545..c3e981525 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20424.4 - 5.0.100-rc.1.20424.4 + 5.0.100-rc.1.20424.5 + 5.0.100-rc.1.20424.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b92febb1cbac0cb0b9ec5f11576bb2708de542d Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 24 Aug 2020 14:43:19 -0700 Subject: [PATCH 049/140] Revert bad merge --- eng/common/templates/post-build/post-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 1de1f5035..e814d5e03 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -298,7 +298,7 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' - - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} @@ -308,9 +308,9 @@ stages: channelName: '.NET 5 RC 1' akaMSChannelName: 'net5/rc1' channelId: ${{ parameters.Net5RC1ChannelId }} - transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json' - shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json' - symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json' + 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: From 8ccd1321c67d055eaa5102735923b1306d20219e 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:39:47 +0000 Subject: [PATCH 050/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.9 (#8272) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20423.8 to 5.0.0-rc.1.20424.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.5 to 5.0.100-rc.1.20424.9 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.5 to 5.0.100-rc.1.20424.9 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 870b414ef..c964f1df3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3706ccb050c13a04511f8531339fca437ad4bc2a - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 9aa4e069b5e9f6a33f7304fa7d58de26424588fb + 529446ec7b398ae6960cff1c6e8c40d0b7f0174c https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 1df1eafb50a190e14b8d0efd761e394f391fde6c + 9ed5504db6113ae88fd171980122bd62d34fa005 - + https://github.com/dotnet/sdk - 1df1eafb50a190e14b8d0efd761e394f391fde6c + 9ed5504db6113ae88fd171980122bd62d34fa005 diff --git a/eng/Versions.props b/eng/Versions.props index c3e981525..59d5edde6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20424.5 - 5.0.100-rc.1.20424.5 + 5.0.100-rc.1.20424.9 + 5.0.100-rc.1.20424.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20423.8 + 5.0.0-rc.1.20424.4 - 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.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 + 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.4 2.1.0 From 5686cf2014a039b6407bfbc85eee8e96dddc470c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 00:34:44 +0000 Subject: [PATCH 051/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.11 (#8273) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.9 to 5.0.100-rc.1.20424.11 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.9 to 5.0.100-rc.1.20424.11 --- 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 c964f1df3..a8df05f0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 9ed5504db6113ae88fd171980122bd62d34fa005 + dd87554ca31f7b821986d9cd772d6f6beca81af2 - + https://github.com/dotnet/sdk - 9ed5504db6113ae88fd171980122bd62d34fa005 + dd87554ca31f7b821986d9cd772d6f6beca81af2 diff --git a/eng/Versions.props b/eng/Versions.props index 59d5edde6..b35b0d6ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.9 - 5.0.100-rc.1.20424.9 + 5.0.100-rc.1.20424.11 + 5.0.100-rc.1.20424.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c43b332ee3e42f60d83a4101457a5d6598568527 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:22:14 +0000 Subject: [PATCH 052/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.12 (#8274) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.11 to 5.0.100-rc.1.20424.12 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.11 to 5.0.100-rc.1.20424.12 --- 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 a8df05f0a..424d3fb50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - dd87554ca31f7b821986d9cd772d6f6beca81af2 + ec616dacaa116c229437da31658408e7aec183c3 - + https://github.com/dotnet/sdk - dd87554ca31f7b821986d9cd772d6f6beca81af2 + ec616dacaa116c229437da31658408e7aec183c3 diff --git a/eng/Versions.props b/eng/Versions.props index b35b0d6ca..f01706d45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.11 - 5.0.100-rc.1.20424.11 + 5.0.100-rc.1.20424.12 + 5.0.100-rc.1.20424.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a228e4659e174b70f1a32f835da31774745eb4ac 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:03:12 +0000 Subject: [PATCH 053/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.13 (#8275) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.7 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.12 to 5.0.100-rc.1.20424.13 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.12 to 5.0.100-rc.1.20424.13 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424d3fb50..4c32166e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3706ccb050c13a04511f8531339fca437ad4bc2a - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 529446ec7b398ae6960cff1c6e8c40d0b7f0174c + 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - ec616dacaa116c229437da31658408e7aec183c3 + 1b7348012eba2563d612cea3f423bfe305ceebde - + https://github.com/dotnet/sdk - ec616dacaa116c229437da31658408e7aec183c3 + 1b7348012eba2563d612cea3f423bfe305ceebde diff --git a/eng/Versions.props b/eng/Versions.props index f01706d45..c3c45ea19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20424.12 - 5.0.100-rc.1.20424.12 + 5.0.100-rc.1.20424.13 + 5.0.100-rc.1.20424.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20424.4 + 5.0.0-rc.1.20424.7 - 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.7 + 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.20424.7 2.1.0 From 20ab47e0061edf00efdc1b2fb2995a63446fde1a 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:41:09 +0000 Subject: [PATCH 054/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.15 (#8276) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.13 to 5.0.100-rc.1.20424.15 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.13 to 5.0.100-rc.1.20424.15 --- 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 4c32166e3..bf90cc6c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 1b7348012eba2563d612cea3f423bfe305ceebde + efb04573783e6d894a379eb17468d45196b6a30c - + https://github.com/dotnet/sdk - 1b7348012eba2563d612cea3f423bfe305ceebde + efb04573783e6d894a379eb17468d45196b6a30c diff --git a/eng/Versions.props b/eng/Versions.props index c3c45ea19..7deacb20f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.13 - 5.0.100-rc.1.20424.13 + 5.0.100-rc.1.20424.15 + 5.0.100-rc.1.20424.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 282f477bc41c4942265fc2b5efef05862e54605a 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:12:39 +0000 Subject: [PATCH 055/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.17 (#8277) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.15 to 5.0.100-rc.1.20424.17 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.15 to 5.0.100-rc.1.20424.17 --- 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 bf90cc6c0..9193b9f06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - efb04573783e6d894a379eb17468d45196b6a30c + aca395da976dccc3c85a717f85db0aa4b69a3c2d - + https://github.com/dotnet/sdk - efb04573783e6d894a379eb17468d45196b6a30c + aca395da976dccc3c85a717f85db0aa4b69a3c2d diff --git a/eng/Versions.props b/eng/Versions.props index 7deacb20f..5b3b0a7a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.15 - 5.0.100-rc.1.20424.15 + 5.0.100-rc.1.20424.17 + 5.0.100-rc.1.20424.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a14563fbb45869f9048ab4464513353d71e6a57 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:49:15 +0000 Subject: [PATCH 056/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.18 (#8278) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20424.4 to 5.0.0-rc.1.20424.9 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.17 to 5.0.100-rc.1.20424.18 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.17 to 5.0.100-rc.1.20424.18 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9193b9f06..01a8e0315 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - aca395da976dccc3c85a717f85db0aa4b69a3c2d + 8aaa7c4ce21e115c3accc7d3bc65148147ace68f - + https://github.com/dotnet/sdk - aca395da976dccc3c85a717f85db0aa4b69a3c2d + 8aaa7c4ce21e115c3accc7d3bc65148147ace68f diff --git a/eng/Versions.props b/eng/Versions.props index 5b3b0a7a7..b95b0769b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20424.17 - 5.0.100-rc.1.20424.17 + 5.0.100-rc.1.20424.18 + 5.0.100-rc.1.20424.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f20ad269a1df49356060f26a9119ec4cdb232e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 05:36:44 +0000 Subject: [PATCH 057/140] Update dependencies from https://github.com/dotnet/sdk build 20200824.19 (#8279) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.18 to 5.0.100-rc.1.20424.19 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.18 to 5.0.100-rc.1.20424.19 --- 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 01a8e0315..7294817de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 8aaa7c4ce21e115c3accc7d3bc65148147ace68f + 60afbc0b214530dc89025a5a78d4aabd285f5667 - + https://github.com/dotnet/sdk - 8aaa7c4ce21e115c3accc7d3bc65148147ace68f + 60afbc0b214530dc89025a5a78d4aabd285f5667 diff --git a/eng/Versions.props b/eng/Versions.props index b95b0769b..230155ebe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.18 - 5.0.100-rc.1.20424.18 + 5.0.100-rc.1.20424.19 + 5.0.100-rc.1.20424.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b558583128aeeb8eefe6be23408faba38593a076 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2020 20:53:02 +0000 Subject: [PATCH 058/140] Update dependencies from https://github.com/dotnet/sdk build 20200825.5 (#8281) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20424.19 to 5.0.100-rc.1.20425.5 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20424.19 to 5.0.100-rc.1.20425.5 --- 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 7294817de..9ef8b3146 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 60afbc0b214530dc89025a5a78d4aabd285f5667 + 280e790ebac8d86dd27bf373da7e0245e340d936 - + https://github.com/dotnet/sdk - 60afbc0b214530dc89025a5a78d4aabd285f5667 + 280e790ebac8d86dd27bf373da7e0245e340d936 diff --git a/eng/Versions.props b/eng/Versions.props index 230155ebe..452c80ec4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20424.19 - 5.0.100-rc.1.20424.19 + 5.0.100-rc.1.20425.5 + 5.0.100-rc.1.20425.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85c205f9d833038f94eaf5a72f5739ee4d320a15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 00:01:33 +0000 Subject: [PATCH 059/140] Update dependencies from https://github.com/dotnet/sdk build 20200825.7 (#8283) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20424.7 to 5.0.0-rc.1.20425.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20425.5 to 5.0.100-rc.1.20425.7 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20425.5 to 5.0.100-rc.1.20425.7 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ef8b3146..51c592571 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 3706ccb050c13a04511f8531339fca437ad4bc2a - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5908e2b3ebf9259d41fc701f15d22dc6bd0959a2 + f4e99f4afa445b519abcd7c5c87cbf54771614db https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 280e790ebac8d86dd27bf373da7e0245e340d936 + 593c9cb7b06dad7660332a8666a886206fbb6170 - + https://github.com/dotnet/sdk - 280e790ebac8d86dd27bf373da7e0245e340d936 + 593c9cb7b06dad7660332a8666a886206fbb6170 diff --git a/eng/Versions.props b/eng/Versions.props index 452c80ec4..2d6d3234d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20425.5 - 5.0.100-rc.1.20425.5 + 5.0.100-rc.1.20425.7 + 5.0.100-rc.1.20425.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20424.7 + 5.0.0-rc.1.20425.1 - 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.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 + 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.1 2.1.0 From 88f6be22c0628eec55d38ad477a460077ec083f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 04:56:40 +0000 Subject: [PATCH 060/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8284) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20425.7 to 5.0.100-rc.1.20425.11 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20425.7 to 5.0.100-rc.1.20425.11 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20424.1 to 5.0.0-rc.1.20425.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51c592571..b933f502c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 593c9cb7b06dad7660332a8666a886206fbb6170 + 44f04829c005f0d58af3e56a7b2f0cf08f9f1c74 - + https://github.com/dotnet/sdk - 593c9cb7b06dad7660332a8666a886206fbb6170 + 44f04829c005f0d58af3e56a7b2f0cf08f9f1c74 - + https://github.com/dotnet/winforms - 7ad393f0e830d91b1c4ebc77500c23acb82d10bb + dd4936c5edb30c78349038737bedcce2539851a2 - + https://github.com/dotnet/wpf - 43da04c01e8506fe4e34b0b7ec76030aaa24fb78 + ff75d520118fa519b558166af462652637649e74 diff --git a/eng/Versions.props b/eng/Versions.props index 2d6d3234d..8e3f51a57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,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.2 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20425.7 - 5.0.100-rc.1.20425.7 + 5.0.100-rc.1.20425.11 + 5.0.100-rc.1.20425.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20424.1 - 5.0.0-rc.1.20424.1 - 5.0.0-rc.1.20424.1 + 5.0.0-rc.1.20425.5 + 5.0.0-rc.1.20425.5 + 5.0.0-rc.1.20425.5 From 834a0ffdff6a65347a6c5e8b08eebd7d9260ae80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 06:39:48 +0000 Subject: [PATCH 061/140] Update dependencies from https://github.com/dotnet/sdk build 20200825.13 (#8285) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20425.11 to 5.0.100-rc.1.20425.13 - Microsoft.NET.Sdk: from 5.0.100-rc.1.20425.11 to 5.0.100-rc.1.20425.13 --- 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 b933f502c..6d3912b4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 44f04829c005f0d58af3e56a7b2f0cf08f9f1c74 + a886f05f2e39b1fc167a4123ade711671aecb055 - + https://github.com/dotnet/sdk - 44f04829c005f0d58af3e56a7b2f0cf08f9f1c74 + a886f05f2e39b1fc167a4123ade711671aecb055 diff --git a/eng/Versions.props b/eng/Versions.props index 8e3f51a57..b6aa8c20d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20425.11 - 5.0.100-rc.1.20425.11 + 5.0.100-rc.1.20425.13 + 5.0.100-rc.1.20425.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7afffc7dd3c0ba175cd05013c5a8c1d6cec9fd19 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:23:01 +0000 Subject: [PATCH 062/140] Update dependencies from https://github.com/dotnet/sdk build 20200825.14 (#8286) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.1 to 5.0.0-rc.1.20425.13 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20425.13 to 5.0.100-rc.1.20425.14 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20425.13 to 5.0.100-rc.1.20425.14 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d3912b4c..1f297267a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - f4e99f4afa445b519abcd7c5c87cbf54771614db + a9e1bbdbe951d5964c76db0f044a8539de73181d https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - a886f05f2e39b1fc167a4123ade711671aecb055 + f940f0c73d9f1ed22d31e22b77b27192f6598c88 - + https://github.com/dotnet/sdk - a886f05f2e39b1fc167a4123ade711671aecb055 + f940f0c73d9f1ed22d31e22b77b27192f6598c88 diff --git a/eng/Versions.props b/eng/Versions.props index b6aa8c20d..7a53f9c63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20425.13 - 5.0.100-rc.1.20425.13 + 5.0.100-rc.1.20425.14 + 5.0.100-rc.1.20425.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20425.1 + 5.0.0-rc.1.20425.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.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 + 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.13 2.1.0 From 48301f6f77be7fe0663feeec189f061e896c590e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 09:00:55 +0000 Subject: [PATCH 063/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.1 (#8287) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.13 to 5.0.0-rc.1.20425.16 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20425.14 to 5.0.100-rc.1.20426.1 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20425.14 to 5.0.100-rc.1.20426.1 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f297267a..1ec5813b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a9e1bbdbe951d5964c76db0f044a8539de73181d + 57cf92a194c1f304fab3c300958cb8b24617194a https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - f940f0c73d9f1ed22d31e22b77b27192f6598c88 + 9e6c2c1ff1ee2516026054bfaee3f35705460ff6 - + https://github.com/dotnet/sdk - f940f0c73d9f1ed22d31e22b77b27192f6598c88 + 9e6c2c1ff1ee2516026054bfaee3f35705460ff6 diff --git a/eng/Versions.props b/eng/Versions.props index 7a53f9c63..32b23be68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20425.14 - 5.0.100-rc.1.20425.14 + 5.0.100-rc.1.20426.1 + 5.0.100-rc.1.20426.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20425.13 + 5.0.0-rc.1.20425.16 - 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.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 + 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.16 2.1.0 From 8569cd6ac3afeee4933f50c8824ab447e6e7fdc9 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:51:00 +0000 Subject: [PATCH 064/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.4 (#8290) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.1 to 5.0.100-rc.1.20426.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.1 to 5.0.100-rc.1.20426.4 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.16 to 5.0.0-rc.1.20425.18 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ec5813b5..34caeaae0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 7ea7eb5e005dc42988a1624734b14fd4de4cc654 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 57cf92a194c1f304fab3c300958cb8b24617194a + 55ab8ce696ea3d2458543176c79c332fecf0af6c https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 9e6c2c1ff1ee2516026054bfaee3f35705460ff6 + 041605d9ca356b8fdabf35bc3b69b92747a89ae9 - + https://github.com/dotnet/sdk - 9e6c2c1ff1ee2516026054bfaee3f35705460ff6 + 041605d9ca356b8fdabf35bc3b69b92747a89ae9 diff --git a/eng/Versions.props b/eng/Versions.props index 32b23be68..a2d4f569e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20426.1 - 5.0.100-rc.1.20426.1 + 5.0.100-rc.1.20426.4 + 5.0.100-rc.1.20426.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20425.16 + 5.0.0-rc.1.20425.18 - 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.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 + 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20425.18 2.1.0 From 019e46cd7bed4a72bd6e44a200ed6514c9bee24d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 19:02:16 +0000 Subject: [PATCH 065/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.8 (#8291) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.4 to 5.0.100-rc.1.20426.8 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.4 to 5.0.100-rc.1.20426.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 34caeaae0..d9f8e23e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 041605d9ca356b8fdabf35bc3b69b92747a89ae9 + 26855b5739422694549adf47ea442454c41da01b - + https://github.com/dotnet/sdk - 041605d9ca356b8fdabf35bc3b69b92747a89ae9 + 26855b5739422694549adf47ea442454c41da01b diff --git a/eng/Versions.props b/eng/Versions.props index a2d4f569e..80f10744a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.4 - 5.0.100-rc.1.20426.4 + 5.0.100-rc.1.20426.8 + 5.0.100-rc.1.20426.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ddde37da48fbb494de3d5b7b04b4b98f1cb01e77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 19:54:06 +0000 Subject: [PATCH 066/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.9 (#8292) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.8 to 5.0.100-rc.1.20426.9 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.8 to 5.0.100-rc.1.20426.9 --- 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 d9f8e23e9..e4b24e268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 26855b5739422694549adf47ea442454c41da01b + 99264150db9aea26bfff0845daeff61e8129cb3c - + https://github.com/dotnet/sdk - 26855b5739422694549adf47ea442454c41da01b + 99264150db9aea26bfff0845daeff61e8129cb3c diff --git a/eng/Versions.props b/eng/Versions.props index 80f10744a..7eece4e99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.8 - 5.0.100-rc.1.20426.8 + 5.0.100-rc.1.20426.9 + 5.0.100-rc.1.20426.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4c34c96a38fd1898d58cdd69e8ccc6ef3d044c96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 21:49:24 +0000 Subject: [PATCH 067/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.10 (#8293) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.9 to 5.0.100-rc.1.20426.10 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.9 to 5.0.100-rc.1.20426.10 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 - dotnet-dev-certs: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 - dotnet-user-secrets: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 - dotnet-watch: from 5.0.0-rc.1.20424.9 to 5.0.0-rc.1.20425.11 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4b24e268..437106d71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 55ab8ce696ea3d2458543176c79c332fecf0af6c - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 99264150db9aea26bfff0845daeff61e8129cb3c + deb3f9b6334644f688b73d0d91eb9abae4e258cf - + https://github.com/dotnet/sdk - 99264150db9aea26bfff0845daeff61e8129cb3c + deb3f9b6334644f688b73d0d91eb9abae4e258cf diff --git a/eng/Versions.props b/eng/Versions.props index 7eece4e99..285d36925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20426.9 - 5.0.100-rc.1.20426.9 + 5.0.100-rc.1.20426.10 + 5.0.100-rc.1.20426.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e6cd5e783a762dff0881fe0769ba74236137c166 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 Aug 2020 22:46:19 +0000 Subject: [PATCH 068/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.11 (#8294) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.10 to 5.0.100-rc.1.20426.11 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.10 to 5.0.100-rc.1.20426.11 --- 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 437106d71..2090d0f19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - deb3f9b6334644f688b73d0d91eb9abae4e258cf + 1c6bdc1d65d9986ab9c140f1fd2290080f2aa68c - + https://github.com/dotnet/sdk - deb3f9b6334644f688b73d0d91eb9abae4e258cf + 1c6bdc1d65d9986ab9c140f1fd2290080f2aa68c diff --git a/eng/Versions.props b/eng/Versions.props index 285d36925..2d193e66f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.10 - 5.0.100-rc.1.20426.10 + 5.0.100-rc.1.20426.11 + 5.0.100-rc.1.20426.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bd3616de5a63a6bea379b3398bba8ea5695ce005 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:52:28 +0000 Subject: [PATCH 069/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.13 (#8295) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20425.2 to 5.0.0-rc.1.20426.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20425.2 to 5.0.0-rc.1.20426.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.11 to 5.0.100-rc.1.20426.13 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.11 to 5.0.100-rc.1.20426.13 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20425.2 to 5.0.0-rc.1.20426.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20425.5 to 5.0.0-rc.1.20426.3 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20425.2 to 5.0.0-rc.1.20426.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2090d0f19..657d3730f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 1c6bdc1d65d9986ab9c140f1fd2290080f2aa68c + 6ab85f2bf2f770c83bc5ffa7439496d5d5d71820 - + https://github.com/dotnet/sdk - 1c6bdc1d65d9986ab9c140f1fd2290080f2aa68c + 6ab85f2bf2f770c83bc5ffa7439496d5d5d71820 - + https://github.com/dotnet/winforms - dd4936c5edb30c78349038737bedcce2539851a2 + 715b8f227d3c3421be94bb934d8a1ece4071463c - + https://github.com/dotnet/wpf - ff75d520118fa519b558166af462652637649e74 + a5e52db01e34eaaced7e640a86b3663885bf9639 diff --git a/eng/Versions.props b/eng/Versions.props index 2d193e66f..741d5290a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20425.2 + 5.0.0-rc.1.20426.1 - 5.0.0-rc.1.20425.2 + 5.0.0-rc.1.20426.2 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.11 - 5.0.100-rc.1.20426.11 + 5.0.100-rc.1.20426.13 + 5.0.100-rc.1.20426.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20425.5 - 5.0.0-rc.1.20425.5 - 5.0.0-rc.1.20425.5 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 + 5.0.0-rc.1.20426.3 From 70d0ad5a6ee8d57aca9c760a6a7850b75d68ca76 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:56:02 +0000 Subject: [PATCH 070/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.14 (#8300) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20425.18 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.13 to 5.0.100-rc.1.20426.14 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.13 to 5.0.100-rc.1.20426.14 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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.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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 657d3730f..791e3c017 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5d6bb51520367aa4443dea346763d3887513dd3f - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 55ab8ce696ea3d2458543176c79c332fecf0af6c + 764ac11a98843a2d85e0de805993b4c12e88141b https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 6ab85f2bf2f770c83bc5ffa7439496d5d5d71820 + 9a080e224a14d28eef7037dc4c026b023e65f849 - + https://github.com/dotnet/sdk - 6ab85f2bf2f770c83bc5ffa7439496d5d5d71820 + 9a080e224a14d28eef7037dc4c026b023e65f849 diff --git a/eng/Versions.props b/eng/Versions.props index 741d5290a..837f7d8b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20426.13 - 5.0.100-rc.1.20426.13 + 5.0.100-rc.1.20426.14 + 5.0.100-rc.1.20426.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20425.18 + 5.0.0-rc.1.20426.5 - 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.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 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 2.1.0 From 7855a2175ec3298bbcafb3e3ef401ff11fb0f494 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 01:54:41 +0000 Subject: [PATCH 071/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8302) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.15 to 5.0.100-rc.1.20426.16 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.15 to 5.0.100-rc.1.20426.16 - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20425.11 to 5.0.0-rc.1.20426.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 791e3c017..71ae3a7ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 764ac11a98843a2d85e0de805993b4c12e88141b - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 9a080e224a14d28eef7037dc4c026b023e65f849 + eb55e7dfed0c629eabd7c47702b7eea97428da07 - + https://github.com/dotnet/sdk - 9a080e224a14d28eef7037dc4c026b023e65f849 + eb55e7dfed0c629eabd7c47702b7eea97428da07 diff --git a/eng/Versions.props b/eng/Versions.props index 837f7d8b9..e05abe2a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20426.14 - 5.0.100-rc.1.20426.14 + 5.0.100-rc.1.20426.16 + 5.0.100-rc.1.20426.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From def96ba2b0b83f11d226973b2dc6193a7e489d2f 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:55:11 +0000 Subject: [PATCH 072/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.17 (#8303) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.16 to 5.0.100-rc.1.20426.17 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.16 to 5.0.100-rc.1.20426.17 --- 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 71ae3a7ec..f6c6a47d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - eb55e7dfed0c629eabd7c47702b7eea97428da07 + 75488951c68e2a55f29ec896016020a3f122f3f0 - + https://github.com/dotnet/sdk - eb55e7dfed0c629eabd7c47702b7eea97428da07 + 75488951c68e2a55f29ec896016020a3f122f3f0 diff --git a/eng/Versions.props b/eng/Versions.props index e05abe2a4..fda96c730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.16 - 5.0.100-rc.1.20426.16 + 5.0.100-rc.1.20426.17 + 5.0.100-rc.1.20426.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9b7da09690ee7cbacf896d8211d2112b8f313837 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:41:59 +0000 Subject: [PATCH 073/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.18 (#8304) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20426.8 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.17 to 5.0.100-rc.1.20426.18 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.17 to 5.0.100-rc.1.20426.18 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6c6a47d8..462f40940 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 5d6bb51520367aa4443dea346763d3887513dd3f - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 764ac11a98843a2d85e0de805993b4c12e88141b + 94e7aa7bc325a0b9fdc14194e5389e0f625e350f https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 75488951c68e2a55f29ec896016020a3f122f3f0 + a7a85d79726e1b78f37bbbb766679294e68c088c - + https://github.com/dotnet/sdk - 75488951c68e2a55f29ec896016020a3f122f3f0 + a7a85d79726e1b78f37bbbb766679294e68c088c diff --git a/eng/Versions.props b/eng/Versions.props index fda96c730..b63088573 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20426.17 - 5.0.100-rc.1.20426.17 + 5.0.100-rc.1.20426.18 + 5.0.100-rc.1.20426.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.8 - 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.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 + 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.8 2.1.0 From f516f5f91ec17e0987d813b70dbed3174c34931a 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:00:29 +0000 Subject: [PATCH 074/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.19 (#8305) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.1 to 5.0.0-rc.1.20426.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.18 to 5.0.100-rc.1.20426.19 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.18 to 5.0.100-rc.1.20426.19 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.1 to 5.0.0-rc.1.20426.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.4 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.2 to 5.0.0-rc.1.20426.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 462f40940..5efec214b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - a7a85d79726e1b78f37bbbb766679294e68c088c + ea67db7b994d881312af16f7e4dd783a1f9e2f53 - + https://github.com/dotnet/sdk - a7a85d79726e1b78f37bbbb766679294e68c088c + ea67db7b994d881312af16f7e4dd783a1f9e2f53 - + https://github.com/dotnet/winforms - 715b8f227d3c3421be94bb934d8a1ece4071463c + 5e942afa425ae8cbf40bd4aff0a1706ce58ae820 - + https://github.com/dotnet/wpf - a5e52db01e34eaaced7e640a86b3663885bf9639 + aefaf67070c89815bfac11631c2d35f9335e564c diff --git a/eng/Versions.props b/eng/Versions.props index b63088573..1086236a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20426.1 + 5.0.0-rc.1.20426.4 - 5.0.0-rc.1.20426.2 + 5.0.0-rc.1.20426.6 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20426.18 - 5.0.100-rc.1.20426.18 + 5.0.100-rc.1.20426.19 + 5.0.100-rc.1.20426.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.4 + 5.0.0-rc.1.20426.4 + 5.0.0-rc.1.20426.4 From dd2e854c910758ab1ce1eab9b8f2521a5d46cec1 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:54:13 +0000 Subject: [PATCH 075/140] Update dependencies from https://github.com/dotnet/sdk build 20200826.21 (#8306) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.8 to 5.0.0-rc.1.20426.10 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.19 to 5.0.100-rc.1.20426.21 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.19 to 5.0.100-rc.1.20426.21 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5efec214b..06b98018a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop bfbeae5f684ed58ed05766ebc41179f4383483dc - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 94e7aa7bc325a0b9fdc14194e5389e0f625e350f + bfc00e4e13578e14c4486693b3470497e3c989c2 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - ea67db7b994d881312af16f7e4dd783a1f9e2f53 + b01036002d7874e92d391eff70b0deea0911e8a5 - + https://github.com/dotnet/sdk - ea67db7b994d881312af16f7e4dd783a1f9e2f53 + b01036002d7874e92d391eff70b0deea0911e8a5 diff --git a/eng/Versions.props b/eng/Versions.props index 1086236a8..ef863fd4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20426.19 - 5.0.100-rc.1.20426.19 + 5.0.100-rc.1.20426.21 + 5.0.100-rc.1.20426.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20426.8 + 5.0.0-rc.1.20426.10 - 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.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 + 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20426.10 2.1.0 From 0ac210a85efe14971b7273f0a074c0c47887f920 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:50:05 +0000 Subject: [PATCH 076/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.2 (#8308) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20426.21 to 5.0.100-rc.1.20427.2 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20426.21 to 5.0.100-rc.1.20427.2 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 - dotnet-dev-certs: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 - dotnet-user-secrets: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 - dotnet-watch: from 5.0.0-rc.1.20426.3 to 5.0.0-rc.1.20426.6 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06b98018a..bb46c8cff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime bfc00e4e13578e14c4486693b3470497e3c989c2 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - b01036002d7874e92d391eff70b0deea0911e8a5 + e08dc0426679918e9385e7f6867e7cca36355736 - + https://github.com/dotnet/sdk - b01036002d7874e92d391eff70b0deea0911e8a5 + e08dc0426679918e9385e7f6867e7cca36355736 diff --git a/eng/Versions.props b/eng/Versions.props index ef863fd4a..1f697f17f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20426.21 - 5.0.100-rc.1.20426.21 + 5.0.100-rc.1.20427.2 + 5.0.100-rc.1.20427.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef5dcedc9486d99bc1e36cefe938e18d19150cb0 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:31:50 +0000 Subject: [PATCH 077/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.4 (#8309) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.2 to 5.0.100-rc.1.20427.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.2 to 5.0.100-rc.1.20427.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 bb46c8cff..3d5bb8f57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - e08dc0426679918e9385e7f6867e7cca36355736 + 97f0ea859c8bd729306ef77d6e05a1e7768587a9 - + https://github.com/dotnet/sdk - e08dc0426679918e9385e7f6867e7cca36355736 + 97f0ea859c8bd729306ef77d6e05a1e7768587a9 diff --git a/eng/Versions.props b/eng/Versions.props index 1f697f17f..a7959ef07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.2 - 5.0.100-rc.1.20427.2 + 5.0.100-rc.1.20427.4 + 5.0.100-rc.1.20427.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aa37e66cb8de086e4d6827a757002b019e0d1928 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:04:29 +0000 Subject: [PATCH 078/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.5 (#8310) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.4 to 5.0.100-rc.1.20427.5 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.4 to 5.0.100-rc.1.20427.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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.4 to 5.0.0-rc.1.20426.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d5bb8f57..9bbad5b6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 97f0ea859c8bd729306ef77d6e05a1e7768587a9 + 95f1e1241544f6a34d8403de6173cae83665129a - + https://github.com/dotnet/sdk - 97f0ea859c8bd729306ef77d6e05a1e7768587a9 + 95f1e1241544f6a34d8403de6173cae83665129a - + https://github.com/dotnet/winforms - 5e942afa425ae8cbf40bd4aff0a1706ce58ae820 + b58fc0d5af1f12f01d0780f1188cc9c4b6854a8d - + https://github.com/dotnet/wpf - aefaf67070c89815bfac11631c2d35f9335e564c + d063baa5b62abdff610c7d7ec3fdd5242ce21c7e diff --git a/eng/Versions.props b/eng/Versions.props index a7959ef07..11af61e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20426.4 + 5.0.0-rc.1.20426.5 - 5.0.0-rc.1.20426.6 + 5.0.0-rc.1.20426.7 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.4 - 5.0.100-rc.1.20427.4 + 5.0.100-rc.1.20427.5 + 5.0.100-rc.1.20427.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20426.4 - 5.0.0-rc.1.20426.4 - 5.0.0-rc.1.20426.4 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20426.5 From 3d63f805c3b442931095f49306869600591460e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 15:14:39 +0000 Subject: [PATCH 079/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8312) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20426.10 to 5.0.0-rc.1.20427.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.5 to 5.0.100-rc.1.20427.9 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.5 to 5.0.100-rc.1.20427.9 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bbad5b6c..9450a477e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - bfc00e4e13578e14c4486693b3470497e3c989c2 + 7d2968eb2d6030287d412d21c7a012831e9f42f0 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 95f1e1241544f6a34d8403de6173cae83665129a + c1abaa6b6f61e1530c79341a2f31d46990f6cd93 - + https://github.com/dotnet/sdk - 95f1e1241544f6a34d8403de6173cae83665129a + c1abaa6b6f61e1530c79341a2f31d46990f6cd93 diff --git a/eng/Versions.props b/eng/Versions.props index 11af61e98..e72af4eb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20427.5 - 5.0.100-rc.1.20427.5 + 5.0.100-rc.1.20427.9 + 5.0.100-rc.1.20427.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20426.10 + 5.0.0-rc.1.20427.1 - 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.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 + 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.1 2.1.0 From 055597b6657605ff9d33e66cd669889fe407cc7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 15:46:19 +0000 Subject: [PATCH 080/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.10 (#8313) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.9 to 5.0.100-rc.1.20427.10 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.9 to 5.0.100-rc.1.20427.10 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - dotnet-dev-certs: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - dotnet-user-secrets: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 - dotnet-watch: from 5.0.0-rc.1.20426.6 to 5.0.0-rc.1.20426.7 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9450a477e..07417a66e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 7d2968eb2d6030287d412d21c7a012831e9f42f0 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - c1abaa6b6f61e1530c79341a2f31d46990f6cd93 + df19f4636e2e98abc1ba3fc8f9754b6e758f20bc - + https://github.com/dotnet/sdk - c1abaa6b6f61e1530c79341a2f31d46990f6cd93 + df19f4636e2e98abc1ba3fc8f9754b6e758f20bc diff --git a/eng/Versions.props b/eng/Versions.props index e72af4eb7..999803ce4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20427.9 - 5.0.100-rc.1.20427.9 + 5.0.100-rc.1.20427.10 + 5.0.100-rc.1.20427.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7c878bc6425ff720bde7e0485071f34e09bf5cb 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:34:58 +0000 Subject: [PATCH 081/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.13 (#8314) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.10 to 5.0.100-rc.1.20427.13 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.10 to 5.0.100-rc.1.20427.13 --- 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 07417a66e..334f25b70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - df19f4636e2e98abc1ba3fc8f9754b6e758f20bc + e3d85d5a1c9833c5f1ed3cd1757c44eb82f1e517 - + https://github.com/dotnet/sdk - df19f4636e2e98abc1ba3fc8f9754b6e758f20bc + e3d85d5a1c9833c5f1ed3cd1757c44eb82f1e517 diff --git a/eng/Versions.props b/eng/Versions.props index 999803ce4..bc56a465a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.10 - 5.0.100-rc.1.20427.10 + 5.0.100-rc.1.20427.13 + 5.0.100-rc.1.20427.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0e732bd87dd326e54293c2ddc3bd6d6afe5fcd75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 20:35:06 +0000 Subject: [PATCH 082/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.16 (#8318) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.1 to 5.0.0-rc.1.20427.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.13 to 5.0.100-rc.1.20427.16 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.13 to 5.0.100-rc.1.20427.16 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 334f25b70..457c3377d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 2ad30c4155e53a2fb7c901eb604a20887b44f8d0 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 7d2968eb2d6030287d412d21c7a012831e9f42f0 + ba5b5d18915eb637e53719373b857a2a310c204f https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - e3d85d5a1c9833c5f1ed3cd1757c44eb82f1e517 + 3b37ab817575d5f5a9457d4bc32ee7ad15c097da - + https://github.com/dotnet/sdk - e3d85d5a1c9833c5f1ed3cd1757c44eb82f1e517 + 3b37ab817575d5f5a9457d4bc32ee7ad15c097da diff --git a/eng/Versions.props b/eng/Versions.props index bc56a465a..6d7830a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20427.13 - 5.0.100-rc.1.20427.13 + 5.0.100-rc.1.20427.16 + 5.0.100-rc.1.20427.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20427.1 + 5.0.0-rc.1.20427.3 - 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.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 + 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.3 2.1.0 From e372caa49ca7b1ce1fe4f2fe951045fff9c482fe 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:49:59 +0000 Subject: [PATCH 083/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.19 (#8319) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.16 to 5.0.100-rc.1.20427.19 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.16 to 5.0.100-rc.1.20427.19 --- 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 457c3377d..ce9d9607c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 3b37ab817575d5f5a9457d4bc32ee7ad15c097da + 2a98f6f747876277d390478652df91d1ab961038 - + https://github.com/dotnet/sdk - 3b37ab817575d5f5a9457d4bc32ee7ad15c097da + 2a98f6f747876277d390478652df91d1ab961038 diff --git a/eng/Versions.props b/eng/Versions.props index 6d7830a6c..09dc6cfa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.16 - 5.0.100-rc.1.20427.16 + 5.0.100-rc.1.20427.19 + 5.0.100-rc.1.20427.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b417e63a528a0e7d2023266d30aa68d99f458cc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 00:56:38 +0000 Subject: [PATCH 084/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.20 (#8321) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.19 to 5.0.100-rc.1.20427.20 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.19 to 5.0.100-rc.1.20427.20 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20426.5 to 5.0.0-rc.1.20427.2 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce9d9607c..585fc3082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 2a98f6f747876277d390478652df91d1ab961038 + 7659ce1caa29e357b8c6690a19db425c9993c73d - + https://github.com/dotnet/sdk - 2a98f6f747876277d390478652df91d1ab961038 + 7659ce1caa29e357b8c6690a19db425c9993c73d - + https://github.com/dotnet/winforms - b58fc0d5af1f12f01d0780f1188cc9c4b6854a8d + 38e18b29cb92f1cc5044eaef5926fc435e0eb248 - + https://github.com/dotnet/wpf - d063baa5b62abdff610c7d7ec3fdd5242ce21c7e + 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 diff --git a/eng/Versions.props b/eng/Versions.props index 09dc6cfa4..41e30f3a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20426.5 + 5.0.0-rc.1.20427.4 - 5.0.0-rc.1.20426.7 + 5.0.0-rc.1.20427.5 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.19 - 5.0.100-rc.1.20427.19 + 5.0.100-rc.1.20427.20 + 5.0.100-rc.1.20427.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.20427.2 + 5.0.0-rc.1.20427.2 + 5.0.0-rc.1.20427.2 From 9634fdffd7e0f5f61dc7098b3790c93d4be08bec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 02:38:37 +0000 Subject: [PATCH 085/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.21 (#8322) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.20 to 5.0.100-rc.1.20427.21 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.20 to 5.0.100-rc.1.20427.21 --- 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 585fc3082..cb483f0af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 7659ce1caa29e357b8c6690a19db425c9993c73d + 62b7cdd9d2aa36e507eb570c59351527af1869cf - + https://github.com/dotnet/sdk - 7659ce1caa29e357b8c6690a19db425c9993c73d + 62b7cdd9d2aa36e507eb570c59351527af1869cf diff --git a/eng/Versions.props b/eng/Versions.props index 41e30f3a3..eb80ceaec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.20 - 5.0.100-rc.1.20427.20 + 5.0.100-rc.1.20427.21 + 5.0.100-rc.1.20427.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5f2d494de2a544897683c789b187f4d672107b28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 04:51:19 +0000 Subject: [PATCH 086/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.23 (#8324) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.4 to 5.0.0-rc.1.20427.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.21 to 5.0.100-rc.1.20427.23 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.21 to 5.0.100-rc.1.20427.23 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.4 to 5.0.0-rc.1.20427.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20427.2 to 5.0.0-rc.1.20427.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb483f0af..f98b18442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 62b7cdd9d2aa36e507eb570c59351527af1869cf + 4536693d5b019185953d527c1b147043046dcd70 - + https://github.com/dotnet/sdk - 62b7cdd9d2aa36e507eb570c59351527af1869cf + 4536693d5b019185953d527c1b147043046dcd70 - + https://github.com/dotnet/winforms - 38e18b29cb92f1cc5044eaef5926fc435e0eb248 + ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 - + https://github.com/dotnet/wpf - 7a98c0ec87ae805af27ec2721d0b852fa60b3db8 + 8597e41c275681fe5e402dff4fcbffbe6bb1e499 diff --git a/eng/Versions.props b/eng/Versions.props index eb80ceaec..6cc8965d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20427.4 + 5.0.0-rc.1.20427.6 - 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.6 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.21 - 5.0.100-rc.1.20427.21 + 5.0.100-rc.1.20427.23 + 5.0.100-rc.1.20427.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20427.2 - 5.0.0-rc.1.20427.2 - 5.0.0-rc.1.20427.2 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 + 5.0.0-rc.1.20427.5 From 9faf122ceecd0c2f476fbc68361dd959d4d8c399 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 05:40:26 +0000 Subject: [PATCH 087/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.26 (#8325) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20426.7 to 5.0.0-rc.1.20427.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.23 to 5.0.100-rc.1.20427.26 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.23 to 5.0.100-rc.1.20427.26 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f98b18442..d8f774d00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime ba5b5d18915eb637e53719373b857a2a310c204f - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 4536693d5b019185953d527c1b147043046dcd70 + 9e261704162c1f7230a27270343ed2e05ffd2c67 - + https://github.com/dotnet/sdk - 4536693d5b019185953d527c1b147043046dcd70 + 9e261704162c1f7230a27270343ed2e05ffd2c67 diff --git a/eng/Versions.props b/eng/Versions.props index 6cc8965d7..8e9529d30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20427.23 - 5.0.100-rc.1.20427.23 + 5.0.100-rc.1.20427.26 + 5.0.100-rc.1.20427.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56570104c6c73c2d80073bc39d883572df32a909 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 07:33:44 +0000 Subject: [PATCH 088/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.27 (#8326) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.26 to 5.0.100-rc.1.20427.27 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.26 to 5.0.100-rc.1.20427.27 --- 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 d8f774d00..2b4c74de9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 9e261704162c1f7230a27270343ed2e05ffd2c67 + 4de044bd2a8dc89866db7281ab8cab015c6e210e - + https://github.com/dotnet/sdk - 9e261704162c1f7230a27270343ed2e05ffd2c67 + 4de044bd2a8dc89866db7281ab8cab015c6e210e diff --git a/eng/Versions.props b/eng/Versions.props index 8e9529d30..9229d63aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20427.26 - 5.0.100-rc.1.20427.26 + 5.0.100-rc.1.20427.27 + 5.0.100-rc.1.20427.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 94b0b663517f5b8669507c7e7dfbb1c7cae70aec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 08:29:23 +0000 Subject: [PATCH 089/140] Update dependencies from https://github.com/dotnet/sdk build 20200827.28 (#8327) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.3 to 5.0.0-rc.1.20427.12 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.27 to 5.0.100-rc.1.20427.28 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.27 to 5.0.100-rc.1.20427.28 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b4c74de9..c6cc2544a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop db9aed75d442d94b3d26e589d7b37acda1b2713a - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ba5b5d18915eb637e53719373b857a2a310c204f + d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 4de044bd2a8dc89866db7281ab8cab015c6e210e + 3263f85370568315a42c914f124f0d342dd00561 - + https://github.com/dotnet/sdk - 4de044bd2a8dc89866db7281ab8cab015c6e210e + 3263f85370568315a42c914f124f0d342dd00561 diff --git a/eng/Versions.props b/eng/Versions.props index 9229d63aa..10596a357 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20427.27 - 5.0.100-rc.1.20427.27 + 5.0.100-rc.1.20427.28 + 5.0.100-rc.1.20427.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20427.3 + 5.0.0-rc.1.20427.12 - 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.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 + 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.12 2.1.0 From 5a7c8f4cc93a92bd3b56242d637f6f10a11719b6 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:02:18 +0000 Subject: [PATCH 090/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8328) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20427.7 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20427.28 to 5.0.100-rc.1.20428.3 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20427.28 to 5.0.100-rc.1.20428.3 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6cc2544a..197e59f42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 3263f85370568315a42c914f124f0d342dd00561 + 1ece74592fb8518e7e70bdefb05c0453ca24bd4a - + https://github.com/dotnet/sdk - 3263f85370568315a42c914f124f0d342dd00561 + 1ece74592fb8518e7e70bdefb05c0453ca24bd4a diff --git a/eng/Versions.props b/eng/Versions.props index 10596a357..8a2b54bf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20427.28 - 5.0.100-rc.1.20427.28 + 5.0.100-rc.1.20428.3 + 5.0.100-rc.1.20428.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 874d47a02b914b5e66a92d0ccb6094f304f18808 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:44:31 +0000 Subject: [PATCH 091/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.4 (#8329) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.12 to 5.0.0-rc.1.20427.16 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.3 to 5.0.100-rc.1.20428.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.3 to 5.0.100-rc.1.20428.4 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 197e59f42..b39682764 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop db9aed75d442d94b3d26e589d7b37acda1b2713a - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d5e0627b44f25dbcf02d6d3a8fdbbc31a6e8e35a + cb2023c5fc31d447227cf21eb360e356b79284e8 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 1ece74592fb8518e7e70bdefb05c0453ca24bd4a + 0fd9b90fc6e4c6f208017ee7e1d7871c1ed9c8ba - + https://github.com/dotnet/sdk - 1ece74592fb8518e7e70bdefb05c0453ca24bd4a + 0fd9b90fc6e4c6f208017ee7e1d7871c1ed9c8ba diff --git a/eng/Versions.props b/eng/Versions.props index 8a2b54bf9..3149b7c61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20428.3 - 5.0.100-rc.1.20428.3 + 5.0.100-rc.1.20428.4 + 5.0.100-rc.1.20428.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20427.12 + 5.0.0-rc.1.20427.16 - 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.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 + 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20427.16 2.1.0 From 887b08ffb5d992eb05cee1c99f9a928a46d596a4 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:17:07 +0000 Subject: [PATCH 092/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.5 (#8331) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.4 to 5.0.100-rc.1.20428.5 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.4 to 5.0.100-rc.1.20428.5 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20427.5 to 5.0.0-rc.1.20428.1 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.6 to 5.0.0-rc.1.20427.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b39682764..5d89e7526 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 0fd9b90fc6e4c6f208017ee7e1d7871c1ed9c8ba + fe22ff4c4646807b891f2821f53873f3e440e343 - + https://github.com/dotnet/sdk - 0fd9b90fc6e4c6f208017ee7e1d7871c1ed9c8ba + fe22ff4c4646807b891f2821f53873f3e440e343 - + https://github.com/dotnet/winforms - ffa5fc5dca80b6a5f4a91cf19574e4e27a809352 + b30494faa02bab485b6061387b80bceefdb81c2c - + https://github.com/dotnet/wpf - 8597e41c275681fe5e402dff4fcbffbe6bb1e499 + 8cf5ebee8056067861612e3f71d33b1b8900e091 diff --git a/eng/Versions.props b/eng/Versions.props index 3149b7c61..b0c7b962e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20427.6 + 5.0.0-rc.1.20427.7 - 5.0.0-rc.1.20427.6 + 5.0.0-rc.1.20427.7 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.4 - 5.0.100-rc.1.20428.4 + 5.0.100-rc.1.20428.5 + 5.0.100-rc.1.20428.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.20428.1 + 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.1 From 26facb6c755ab8f5c7f963ac0af9e502ba4bb50f 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:09:02 +0000 Subject: [PATCH 093/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.6 (#8332) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20427.9 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.5 to 5.0.100-rc.1.20428.6 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.5 to 5.0.100-rc.1.20428.6 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d89e7526..4416cbff6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime cb2023c5fc31d447227cf21eb360e356b79284e8 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - fe22ff4c4646807b891f2821f53873f3e440e343 + a7ad36035a5a517e45ebd382e76273909a768eb4 - + https://github.com/dotnet/sdk - fe22ff4c4646807b891f2821f53873f3e440e343 + a7ad36035a5a517e45ebd382e76273909a768eb4 diff --git a/eng/Versions.props b/eng/Versions.props index b0c7b962e..7299f5824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20428.5 - 5.0.100-rc.1.20428.5 + 5.0.100-rc.1.20428.6 + 5.0.100-rc.1.20428.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fa4bcc2379baaf3da9f45c19e3391d5e70031dd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:15:47 +0000 Subject: [PATCH 094/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.8 (#8333) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.6 to 5.0.100-rc.1.20428.8 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.6 to 5.0.100-rc.1.20428.8 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.2 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20427.7 to 5.0.0-rc.1.20428.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4416cbff6..19283f9be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - a7ad36035a5a517e45ebd382e76273909a768eb4 + 76686bb6d7c4f9952b78f0311a2b714c4fcd4806 - + https://github.com/dotnet/sdk - a7ad36035a5a517e45ebd382e76273909a768eb4 + 76686bb6d7c4f9952b78f0311a2b714c4fcd4806 - + https://github.com/dotnet/winforms - b30494faa02bab485b6061387b80bceefdb81c2c + 3789739a2b727555d562523c3d5bb114c780cc64 - + https://github.com/dotnet/wpf - 8cf5ebee8056067861612e3f71d33b1b8900e091 + 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 diff --git a/eng/Versions.props b/eng/Versions.props index 7299f5824..7c2bd09c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20428.1 - 5.0.0-rc.1.20427.7 + 5.0.0-rc.1.20428.1 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.6 - 5.0.100-rc.1.20428.6 + 5.0.100-rc.1.20428.8 + 5.0.100-rc.1.20428.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20428.1 - 5.0.0-rc.1.20428.1 - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20428.2 From fdb3ba03eec79c64a5fb0e42cb798f99fffa6cd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:58:44 +0000 Subject: [PATCH 095/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.10 (#8334) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.8 to 5.0.100-rc.1.20428.10 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.8 to 5.0.100-rc.1.20428.10 --- 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 19283f9be..cba9019c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 76686bb6d7c4f9952b78f0311a2b714c4fcd4806 + 534223256142928d67f5ab6f3c28870cdcbccfff - + https://github.com/dotnet/sdk - 76686bb6d7c4f9952b78f0311a2b714c4fcd4806 + 534223256142928d67f5ab6f3c28870cdcbccfff diff --git a/eng/Versions.props b/eng/Versions.props index 7c2bd09c8..3011fcedd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.8 - 5.0.100-rc.1.20428.8 + 5.0.100-rc.1.20428.10 + 5.0.100-rc.1.20428.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f8febf8fc14ef69aba1c68b5fc7621187d0c2670 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 18:58:45 +0000 Subject: [PATCH 096/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.14 (#8335) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20427.16 to 5.0.0-rc.1.20428.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.10 to 5.0.100-rc.1.20428.14 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.10 to 5.0.100-rc.1.20428.14 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cba9019c2..b3816853f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop e6a25e7a2714e1784ee4d8a62efad951f0527eb3 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - cb2023c5fc31d447227cf21eb360e356b79284e8 + 1dfd9438149f74ae11918a7b0709b8d58c61443f https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 534223256142928d67f5ab6f3c28870cdcbccfff + b4865cdf483ff0e319ab441bb878286a85018a85 - + https://github.com/dotnet/sdk - 534223256142928d67f5ab6f3c28870cdcbccfff + b4865cdf483ff0e319ab441bb878286a85018a85 diff --git a/eng/Versions.props b/eng/Versions.props index 3011fcedd..7fbae3e33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20428.10 - 5.0.100-rc.1.20428.10 + 5.0.100-rc.1.20428.14 + 5.0.100-rc.1.20428.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20427.16 + 5.0.0-rc.1.20428.3 - 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.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 + 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.3 2.1.0 From 2cf87a9c5d644c421ae9f266734c90ce355c9f65 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:48:32 +0000 Subject: [PATCH 097/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.16 (#8336) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.14 to 5.0.100-rc.1.20428.16 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.14 to 5.0.100-rc.1.20428.16 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 - dotnet-dev-certs: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 - dotnet-user-secrets: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 - dotnet-watch: from 5.0.0-rc.1.20427.9 to 5.0.0-rc.1.20428.2 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b3816853f..8bc7b5142 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - b4865cdf483ff0e319ab441bb878286a85018a85 + 2b9442184141b861081de43b180a509dbf6b05af - + https://github.com/dotnet/sdk - b4865cdf483ff0e319ab441bb878286a85018a85 + 2b9442184141b861081de43b180a509dbf6b05af diff --git a/eng/Versions.props b/eng/Versions.props index 7fbae3e33..70db4d6a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20428.14 - 5.0.100-rc.1.20428.14 + 5.0.100-rc.1.20428.16 + 5.0.100-rc.1.20428.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62a8b6324abfad0185be61d0e77f40a69f50f771 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:18:25 +0000 Subject: [PATCH 098/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.19 (#8337) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.16 to 5.0.100-rc.1.20428.19 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.16 to 5.0.100-rc.1.20428.19 --- 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 8bc7b5142..ea2ddd544 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 2b9442184141b861081de43b180a509dbf6b05af + 3e518118edb38a54014b00ee48ff5e1b658a80d6 - + https://github.com/dotnet/sdk - 2b9442184141b861081de43b180a509dbf6b05af + 3e518118edb38a54014b00ee48ff5e1b658a80d6 diff --git a/eng/Versions.props b/eng/Versions.props index 70db4d6a4..1b9d67d77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.16 - 5.0.100-rc.1.20428.16 + 5.0.100-rc.1.20428.19 + 5.0.100-rc.1.20428.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 284d2936906c8517ab092df472c14d866784eae5 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:35:06 +0000 Subject: [PATCH 099/140] Update dependencies from https://github.com/dotnet/arcade build 20200827.5 (#8338) [release/5.0.1xx] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Build.Tasks.Installers: from 5.0.0-beta.20417.6 to 5.0.0-beta.20427.5 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20417.6 to 5.0.0-beta.20427.5 --- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- 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/blazor_perf.proj | 30 ++ eng/common/performance/crossgen_perf.proj | 118 +++-- eng/common/performance/microbenchmarks.proj | 4 +- eng/common/performance/performance-setup.sh | 33 +- 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 | 412 ++++++++++-------- .../post-build/setup-maestro-vars.yml | 28 +- eng/common/tools.ps1 | 20 +- eng/common/tools.sh | 72 +-- global.json | 2 +- 18 files changed, 449 insertions(+), 339 deletions(-) create mode 100644 eng/common/performance/blazor_perf.proj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea2ddd544..9c1156cd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,13 +98,13 @@ - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 - + https://github.com/dotnet/arcade - 83fda4b3f6d93e713749fd1b27c4a6d40b118b13 + f2b7fe854a0b1f78c04dfc065164d6d61040f5b8 diff --git a/eng/Versions.props b/eng/Versions.props index 1b9d67d77..f2f8f2627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20417.6 + 5.0.0-beta.20427.5 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 67ee6d28d..94a91c081 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 6d7c5a1f6..252b63604 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 25a0efa0b..9a4438af6 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 "< + + 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 3c8c33d70..426492038 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -1,80 +1,68 @@ - - 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 - - - - $(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 - - %(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 - + + + py -3 + $(HelixPreCommands) + %HELIX_CORRELATION_PAYLOAD%\Core_Root + %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\ + $(ScenarioDirectory)crossgen\ + $(ScenarioDirectory)crossgen2\ + + + python3 + $(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/ + + + + + + + + + + + - - - $(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) + $(Python) $(CrossgenDirectory)test.py crossgen --core-root $(CoreRoot) --test-name %(Identity) + + + + + + $(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.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + 4:00 - - $(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)\ScenarioCorrelation - $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root - - - $(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/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj index 5c95ef458..94b6efbc9 100644 --- a/eng/common/performance/microbenchmarks.proj +++ b/eng/common/performance/microbenchmarks.proj @@ -46,10 +46,10 @@ - --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 fd26bdb17..806e56c61 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 ;; @@ -194,27 +200,30 @@ 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" + configurations="CompilationMode=wasm RunKind=$kind" + 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" +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" -# 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= @@ -265,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/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d22eb439c..f044afe8f 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 12db36ebe..59eb93a40 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 bf98d990e..7e80a621a 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 e814d5e03..630a99d4d 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 @@ -49,6 +56,7 @@ parameters: NetEngServicesProdChannelId: 679 Net5Preview8ChannelId: 1155 Net5RC1ChannelId: 1157 + Net5RC2ChannelId: 1329 NetCoreSDK313xxChannelId: 759 NetCoreSDK313xxInternalChannelId: 760 NetCoreSDK314xxChannelId: 921 @@ -59,14 +67,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.Net5RC2ChannelId}},${{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 +259,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 +284,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 +300,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 +316,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 +332,24 @@ 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 }} + 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 }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} dependsOn: ${{ parameters.publishDependsOn }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} @@ -328,6 +364,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 +380,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 +396,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 +411,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 +426,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 +441,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 +456,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 +471,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 +486,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 +501,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 +516,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 +531,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 +546,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 +561,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 +576,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 +591,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 b3d29d449..d0cbfb6c6 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/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6f8bc4111..c2e575c97 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 } } @@ -602,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 e94fce22e..2be5cba30 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" + 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" + 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" - 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 } } @@ -391,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 d9533467a..133b66d4b 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5" } } From 4aa3ccee31a1102f70e38b48a6f605f6533a2ac2 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:25:29 +0000 Subject: [PATCH 100/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.20 (#8339) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.19 to 5.0.100-rc.1.20428.20 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.19 to 5.0.100-rc.1.20428.20 --- 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 9c1156cd4..b04a19faa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 3e518118edb38a54014b00ee48ff5e1b658a80d6 + e35c9de108599437ddd96489e8430e293321f17e - + https://github.com/dotnet/sdk - 3e518118edb38a54014b00ee48ff5e1b658a80d6 + e35c9de108599437ddd96489e8430e293321f17e diff --git a/eng/Versions.props b/eng/Versions.props index f2f8f2627..3c0ac99a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.19 - 5.0.100-rc.1.20428.19 + 5.0.100-rc.1.20428.20 + 5.0.100-rc.1.20428.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 759c076d508dc4cd77d56bd5390c5705f493ad7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Aug 2020 23:09:08 +0000 Subject: [PATCH 101/140] Update dependencies from https://github.com/dotnet/sdk build 20200828.21 (#8340) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.20 to 5.0.100-rc.1.20428.21 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.20 to 5.0.100-rc.1.20428.21 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b04a19faa..4bbab7a5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - e35c9de108599437ddd96489e8430e293321f17e + 747aadb5f2663e90208ccb5d05fbbb813fca9474 - + https://github.com/dotnet/sdk - e35c9de108599437ddd96489e8430e293321f17e + 747aadb5f2663e90208ccb5d05fbbb813fca9474 diff --git a/eng/Versions.props b/eng/Versions.props index 3c0ac99a0..aac70d58e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20428.20 - 5.0.100-rc.1.20428.20 + 5.0.100-rc.1.20428.21 + 5.0.100-rc.1.20428.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8ab7a3fadaef003bbd1b29be9c5329b3b1b930fb 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:11:54 +0000 Subject: [PATCH 102/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8341) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.21 to 5.0.100-rc.1.20428.26 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.21 to 5.0.100-rc.1.20428.26 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.2 to 5.0.0-rc.1.20428.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.1 to 5.0.0-rc.1.20428.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bbab7a5a..c9d8a6612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 747aadb5f2663e90208ccb5d05fbbb813fca9474 + 547e2b3eb79e1fcd668177458ddabadc13c649fd - + https://github.com/dotnet/sdk - 747aadb5f2663e90208ccb5d05fbbb813fca9474 + 547e2b3eb79e1fcd668177458ddabadc13c649fd - + https://github.com/dotnet/winforms - 3789739a2b727555d562523c3d5bb114c780cc64 + b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/wpf - 2138e7eebaf6e1759c9f447f0009c2889bd5e7d0 + e83115f008844bb8b63dc5914bf085af01cb7e6e diff --git a/eng/Versions.props b/eng/Versions.props index aac70d58e..0057011d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.3 - 5.0.0-rc.1.20428.1 + 5.0.0-rc.1.20428.3 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20428.21 - 5.0.100-rc.1.20428.21 + 5.0.100-rc.1.20428.26 + 5.0.100-rc.1.20428.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,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.5 + 5.0.0-rc.1.20428.5 + 5.0.0-rc.1.20428.5 From a921001cdd3805e1bd0f005c00ac77293527fb5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 05:35:36 +0000 Subject: [PATCH 103/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8342) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.26 to 5.0.100-rc.1.20428.29 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.26 to 5.0.100-rc.1.20428.29 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 - dotnet-dev-certs: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 - dotnet-user-secrets: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 - dotnet-watch: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20428.10 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9d8a6612..2fde3c359 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 - + https://github.com/dotnet/aspnetcore - 748b368d54b2ff841789d24c3c83a555bd38cc63 + fdfd7d07aecf403838ef37944019e6f9f77c3d04 https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 547e2b3eb79e1fcd668177458ddabadc13c649fd + 0081a88cee928535e00f347e7b6ddba8dcb57015 - + https://github.com/dotnet/sdk - 547e2b3eb79e1fcd668177458ddabadc13c649fd + 0081a88cee928535e00f347e7b6ddba8dcb57015 diff --git a/eng/Versions.props b/eng/Versions.props index 0057011d1..9327dc565 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20428.26 - 5.0.100-rc.1.20428.26 + 5.0.100-rc.1.20428.29 + 5.0.100-rc.1.20428.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 461a8bd9db243f0f96efd67dce6a5c022e290a29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 11:13:00 +0000 Subject: [PATCH 104/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8343) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20428.29 to 5.0.100-rc.1.20429.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20428.29 to 5.0.100-rc.1.20429.4 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 - dotnet-dev-certs: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 - dotnet-user-secrets: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 - dotnet-watch: from 5.0.0-rc.1.20428.10 to 5.0.0-rc.1.20428.16 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fde3c359..e78997cb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 1dfd9438149f74ae11918a7b0709b8d58c61443f - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee - + https://github.com/dotnet/aspnetcore - fdfd7d07aecf403838ef37944019e6f9f77c3d04 + f891c2b15dd5b955968de16ad616e520b76475ee https://github.com/dotnet/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 0081a88cee928535e00f347e7b6ddba8dcb57015 + 19d745b732e7272191819291f35b43be11f84b8d - + https://github.com/dotnet/sdk - 0081a88cee928535e00f347e7b6ddba8dcb57015 + 19d745b732e7272191819291f35b43be11f84b8d diff --git a/eng/Versions.props b/eng/Versions.props index 9327dc565..065816ea0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20428.29 - 5.0.100-rc.1.20428.29 + 5.0.100-rc.1.20429.4 + 5.0.100-rc.1.20429.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73b22cf278d5c43aa65f3dc2c0a0c26e70f7b613 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 18:06:59 +0000 Subject: [PATCH 105/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8345) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.4 to 5.0.100-rc.1.20429.12 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.4 to 5.0.100-rc.1.20429.12 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.9 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - dotnet-dev-certs: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - dotnet-user-secrets: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - dotnet-watch: from 5.0.0-rc.1.20428.16 to 5.0.0-rc.1.20429.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.5 to 5.0.0-rc.1.20428.11 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.8 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++++----------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e78997cb2..f5c7a227d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + 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/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1dfd9438149f74ae11918a7b0709b8d58c61443f + 10068f4363ab3681de9ca3bb8a88428c74ff37fa - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda - + https://github.com/dotnet/aspnetcore - f891c2b15dd5b955968de16ad616e520b76475ee + 44175edd79d385e7b138d00da99a883125e0dcda https://github.com/dotnet/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 19d745b732e7272191819291f35b43be11f84b8d + 4f9496689b0bba7047a4f135d7d682e35ac217b5 - + https://github.com/dotnet/sdk - 19d745b732e7272191819291f35b43be11f84b8d + 4f9496689b0bba7047a4f135d7d682e35ac217b5 https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/wpf - e83115f008844bb8b63dc5914bf085af01cb7e6e + 20c4aa126ccd150466c6074ac01218ed742311ae diff --git a/eng/Versions.props b/eng/Versions.props index 065816ea0..59e41142c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.8 @@ -41,41 +41,41 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20429.4 - 5.0.100-rc.1.20429.4 + 5.0.100-rc.1.20429.12 + 5.0.100-rc.1.20429.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.9 - 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.20428.3 - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.9 + 5.0.0-rc.1.20428.9 + 5.0.0-rc.1.20428.9 + 5.0.0-rc.1.20428.9 + 5.0.0-rc.1.20428.9 2.1.0 - 5.0.0-rc.1.20428.5 - 5.0.0-rc.1.20428.5 - 5.0.0-rc.1.20428.5 + 5.0.0-rc.1.20428.11 + 5.0.0-rc.1.20428.11 + 5.0.0-rc.1.20428.11 From 49e7cfbe419eed9b3258441e368f6615d00c1e2f 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:07:14 +0000 Subject: [PATCH 106/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.13 (#8346) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.12 to 5.0.100-rc.1.20429.13 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.12 to 5.0.100-rc.1.20429.13 --- 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 f5c7a227d..0a5010560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 4f9496689b0bba7047a4f135d7d682e35ac217b5 + f721259bfd6fff43dae909bd491c8b53102c636a - + https://github.com/dotnet/sdk - 4f9496689b0bba7047a4f135d7d682e35ac217b5 + f721259bfd6fff43dae909bd491c8b53102c636a diff --git a/eng/Versions.props b/eng/Versions.props index 59e41142c..61f88fa6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.12 - 5.0.100-rc.1.20429.12 + 5.0.100-rc.1.20429.13 + 5.0.100-rc.1.20429.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cf5bbf9af7f0b0443a7e7650d085b3bc3ac1d266 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:53:14 +0000 Subject: [PATCH 107/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.14 (#8347) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.13 to 5.0.100-rc.1.20429.14 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.13 to 5.0.100-rc.1.20429.14 --- 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 0a5010560..cccf394d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - f721259bfd6fff43dae909bd491c8b53102c636a + 0b811aa33fce54d2004fb0f0b3ea2c857a6dc43c - + https://github.com/dotnet/sdk - f721259bfd6fff43dae909bd491c8b53102c636a + 0b811aa33fce54d2004fb0f0b3ea2c857a6dc43c diff --git a/eng/Versions.props b/eng/Versions.props index 61f88fa6a..c57c2cdd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.13 - 5.0.100-rc.1.20429.13 + 5.0.100-rc.1.20429.14 + 5.0.100-rc.1.20429.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 672a88fc0c6fc3a1a51a0692b01afb971ef1684b 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:29:55 +0000 Subject: [PATCH 108/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.15 (#8348) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.14 to 5.0.100-rc.1.20429.15 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.14 to 5.0.100-rc.1.20429.15 --- 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 cccf394d3..be00a3354 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 0b811aa33fce54d2004fb0f0b3ea2c857a6dc43c + f8085bce6422bd1b353ed3b983a162d878e47d83 - + https://github.com/dotnet/sdk - 0b811aa33fce54d2004fb0f0b3ea2c857a6dc43c + f8085bce6422bd1b353ed3b983a162d878e47d83 diff --git a/eng/Versions.props b/eng/Versions.props index c57c2cdd8..c1eacffac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.14 - 5.0.100-rc.1.20429.14 + 5.0.100-rc.1.20429.15 + 5.0.100-rc.1.20429.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 244b8de47278a7dd9ff7d1f5e2c58e8570db3774 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Aug 2020 22:46:13 +0000 Subject: [PATCH 109/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.16 (#8349) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.15 to 5.0.100-rc.1.20429.16 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.15 to 5.0.100-rc.1.20429.16 - 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.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20428.11 to 5.0.0-rc.1.20429.2 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20428.8 to 5.0.0-rc.1.20429.3 --- 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 be00a3354..1a35745dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - f8085bce6422bd1b353ed3b983a162d878e47d83 + 79e262a93e0dd963f54fa3cb66b686946bebb8e7 - + https://github.com/dotnet/sdk - f8085bce6422bd1b353ed3b983a162d878e47d83 + 79e262a93e0dd963f54fa3cb66b686946bebb8e7 https://github.com/dotnet/winforms b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 - + https://github.com/dotnet/wpf - 20c4aa126ccd150466c6074ac01218ed742311ae + ef2d4afbd427a894fc0c001c4baeb0d3acdded44 diff --git a/eng/Versions.props b/eng/Versions.props index c1eacffac..5d2df5e59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-rc.1.20428.8 + 5.0.0-rc.1.20429.3 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.15 - 5.0.100-rc.1.20429.15 + 5.0.100-rc.1.20429.16 + 5.0.100-rc.1.20429.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20428.11 - 5.0.0-rc.1.20428.11 - 5.0.0-rc.1.20428.11 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20429.2 From 8f45d97411b182f752f9c584c88d121716ed6072 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 01:12:48 +0000 Subject: [PATCH 110/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.17 (#8350) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.16 to 5.0.100-rc.1.20429.17 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.16 to 5.0.100-rc.1.20429.17 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.3 to 5.0.0-rc.1.20428.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20429.3 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a35745dc..06e18439a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 79e262a93e0dd963f54fa3cb66b686946bebb8e7 + 77b00c51d54023c5ffbec31b23db4831a59f0a91 - + https://github.com/dotnet/sdk - 79e262a93e0dd963f54fa3cb66b686946bebb8e7 + 77b00c51d54023c5ffbec31b23db4831a59f0a91 - + https://github.com/dotnet/winforms - b9e9b7fc265d8aea59f96b3f84dcfbed0749c167 + 16c91865e53aeaf19dd4461e6614584e92810258 - + https://github.com/dotnet/wpf - ef2d4afbd427a894fc0c001c4baeb0d3acdded44 + 5a18148b821e48b09fa09d66b470f992449b4735 diff --git a/eng/Versions.props b/eng/Versions.props index 5d2df5e59..52ab89624 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20428.3 + 5.0.0-rc.1.20428.4 - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.4 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.16 - 5.0.100-rc.1.20429.16 + 5.0.100-rc.1.20429.17 + 5.0.100-rc.1.20429.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.3 + 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20429.3 From 4b6d8c84136a760aeebf1113f8c11c867c5e10b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 03:14:36 +0000 Subject: [PATCH 111/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.18 (#8351) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.17 to 5.0.100-rc.1.20429.18 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.17 to 5.0.100-rc.1.20429.18 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20428.9 to 5.0.0-rc.1.20429.3 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06e18439a..5ea882f38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop b57f5af941560761d31f6e6e2abb5baffc3c315e - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 10068f4363ab3681de9ca3bb8a88428c74ff37fa + ef47b653d657edc4235e79a16a21dd8302e195b8 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 77b00c51d54023c5ffbec31b23db4831a59f0a91 + 44e293a0911ae3edee2dc71d8bfd8c76be8cb4dd - + https://github.com/dotnet/sdk - 77b00c51d54023c5ffbec31b23db4831a59f0a91 + 44e293a0911ae3edee2dc71d8bfd8c76be8cb4dd diff --git a/eng/Versions.props b/eng/Versions.props index 52ab89624..faf66f6d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,34 +41,34 @@ - 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 0.2.0 - 5.0.100-rc.1.20429.17 - 5.0.100-rc.1.20429.17 + 5.0.100-rc.1.20429.18 + 5.0.100-rc.1.20429.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20428.9 + 5.0.0-rc.1.20429.3 - 5.0.0-rc.1.20428.9 - 5.0.0-rc.1.20428.9 - 5.0.0-rc.1.20428.9 - 5.0.0-rc.1.20428.9 - 5.0.0-rc.1.20428.9 + 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.20429.3 + 5.0.0-rc.1.20429.3 2.1.0 From a0b07ca4aec056e413a7d9344c3fbbf06ce19fa4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 03:56:21 +0000 Subject: [PATCH 112/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.19 (#8352) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20429.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.18 to 5.0.100-rc.1.20429.19 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.18 to 5.0.100-rc.1.20429.19 - 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.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20428.4 to 5.0.0-rc.1.20429.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20429.5 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.4 to 5.0.0-rc.1.20429.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ea882f38..b49cf84bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 44e293a0911ae3edee2dc71d8bfd8c76be8cb4dd + 3369f36d7286f01c3ea887786ea3090222e632f4 - + https://github.com/dotnet/sdk - 44e293a0911ae3edee2dc71d8bfd8c76be8cb4dd + 3369f36d7286f01c3ea887786ea3090222e632f4 - + https://github.com/dotnet/winforms - 16c91865e53aeaf19dd4461e6614584e92810258 + 6186819240e9556694415444e117e148ccf17a8b - + https://github.com/dotnet/wpf - 5a18148b821e48b09fa09d66b470f992449b4735 + 5d292c5f6bfd9c64ac20816f42309213871a0ff4 diff --git a/eng/Versions.props b/eng/Versions.props index faf66f6d6..76d10a427 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20428.4 + 5.0.0-rc.1.20429.2 - 5.0.0-rc.1.20429.4 + 5.0.0-rc.1.20429.6 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.18 - 5.0.100-rc.1.20429.18 + 5.0.100-rc.1.20429.19 + 5.0.100-rc.1.20429.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.20429.5 + 5.0.0-rc.1.20429.5 + 5.0.0-rc.1.20429.5 From 05d008746b4110fb507c7e9e1f668d681ae6ce38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 05:48:41 +0000 Subject: [PATCH 113/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.20 (#8353) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20429.6 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.19 to 5.0.100-rc.1.20429.20 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.19 to 5.0.100-rc.1.20429.20 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b49cf84bf..ef7dfba78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime ef47b653d657edc4235e79a16a21dd8302e195b8 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 33ab866736b99a365bc18640ebab4e6be75d69bf - + https://github.com/dotnet/sdk - 3369f36d7286f01c3ea887786ea3090222e632f4 + 617ff8f8a4da10e01c0ff8b270b2cf22c935ef10 - + https://github.com/dotnet/sdk - 3369f36d7286f01c3ea887786ea3090222e632f4 + 617ff8f8a4da10e01c0ff8b270b2cf22c935ef10 diff --git a/eng/Versions.props b/eng/Versions.props index 76d10a427..7f3ef2486 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20429.19 - 5.0.100-rc.1.20429.19 + 5.0.100-rc.1.20429.20 + 5.0.100-rc.1.20429.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a1e2ffa21899f7083486182166332bcb86c91527 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 06:35:34 +0000 Subject: [PATCH 114/140] Update dependencies from https://github.com/dotnet/sdk build 20200829.21 (#8354) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20424.2 to 5.0.0-rc.1.20428.2 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.20 to 5.0.100-rc.1.20429.21 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.20 to 5.0.100-rc.1.20429.21 - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20424.2 to 5.0.0-rc.1.20428.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef7dfba78..32cb8bd5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,17 +75,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 33ab866736b99a365bc18640ebab4e6be75d69bf + 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 617ff8f8a4da10e01c0ff8b270b2cf22c935ef10 + 051a8a311a4de4455cd463078868d4be7c7298dc - + https://github.com/dotnet/sdk - 617ff8f8a4da10e01c0ff8b270b2cf22c935ef10 + 051a8a311a4de4455cd463078868d4be7c7298dc diff --git a/eng/Versions.props b/eng/Versions.props index 7f3ef2486..4d027f08b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 5.0.0-rc.1.20424.2 + 5.0.0-rc.1.20428.2 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20429.20 - 5.0.100-rc.1.20429.20 + 5.0.100-rc.1.20429.21 + 5.0.100-rc.1.20429.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6fa476feeb2830faecc71a5f12fe70e25235a73b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Aug 2020 08:43:44 +0000 Subject: [PATCH 115/140] Update dependencies from https://github.com/dotnet/sdk build 20200830.1 (#8355) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20429.21 to 5.0.100-rc.1.20430.1 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20429.21 to 5.0.100-rc.1.20430.1 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 - dotnet-dev-certs: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 - dotnet-user-secrets: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 - dotnet-watch: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20429.8 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32cb8bd5b..6b5e1cc5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime ef47b653d657edc4235e79a16a21dd8302e195b8 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 051a8a311a4de4455cd463078868d4be7c7298dc + 5be6fde57e6ef096f843af63c54bf70d0b3c46b2 - + https://github.com/dotnet/sdk - 051a8a311a4de4455cd463078868d4be7c7298dc + 5be6fde57e6ef096f843af63c54bf70d0b3c46b2 diff --git a/eng/Versions.props b/eng/Versions.props index 4d027f08b..6c8dca907 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20429.21 - 5.0.100-rc.1.20429.21 + 5.0.100-rc.1.20430.1 + 5.0.100-rc.1.20430.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98d9970781fd97f4d0c0df04397da2c41dd744eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 01:19:12 +0000 Subject: [PATCH 116/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8356) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20430.1 to 5.0.100-rc.1.20430.4 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20430.1 to 5.0.100-rc.1.20430.4 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20429.3 to 5.0.0-rc.1.20430.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b5e1cc5b..2be94239b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 126392251c4aa36a34224a842f29e5cbb28c0876 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - ef47b653d657edc4235e79a16a21dd8302e195b8 + 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 5be6fde57e6ef096f843af63c54bf70d0b3c46b2 + 27b46f96c9cdbbff0bb49b80006174be2f9c50fb - + https://github.com/dotnet/sdk - 5be6fde57e6ef096f843af63c54bf70d0b3c46b2 + 27b46f96c9cdbbff0bb49b80006174be2f9c50fb diff --git a/eng/Versions.props b/eng/Versions.props index 6c8dca907..065dd05c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20430.1 - 5.0.100-rc.1.20430.1 + 5.0.100-rc.1.20430.4 + 5.0.100-rc.1.20430.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20429.3 + 5.0.0-rc.1.20430.5 - 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.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 + 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.5 2.1.0 From 804a3199764e1742cc29fa1263c7db4f05cfe947 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:55:17 +0000 Subject: [PATCH 117/140] Update dependencies from https://github.com/dotnet/sdk build 20200830.5 (#8359) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20430.5 to 5.0.0-rc.1.20430.6 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20430.4 to 5.0.100-rc.1.20430.5 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20430.4 to 5.0.100-rc.1.20430.5 - Microsoft.NETCore.App.Ref: 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.Runtime.win-x64: 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 - 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2be94239b..69f47ee69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 126392251c4aa36a34224a842f29e5cbb28c0876 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 1f6cf4f227538c3ad1c115ad2296a5cf89f5f6f0 + 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 27b46f96c9cdbbff0bb49b80006174be2f9c50fb + 2cdb97e29152d71ba6b3cda7c65dc8d23cc4874e - + https://github.com/dotnet/sdk - 27b46f96c9cdbbff0bb49b80006174be2f9c50fb + 2cdb97e29152d71ba6b3cda7c65dc8d23cc4874e diff --git a/eng/Versions.props b/eng/Versions.props index 065dd05c5..7a59beee1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20430.4 - 5.0.100-rc.1.20430.4 + 5.0.100-rc.1.20430.5 + 5.0.100-rc.1.20430.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20430.5 + 5.0.0-rc.1.20430.6 - 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.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 + 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20430.6 2.1.0 From a018ea77617c61a236493342323f5497049f782a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 09:15:38 +0000 Subject: [PATCH 118/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8360) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20429.8 to 5.0.0-rc.1.20430.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20430.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.5 to 5.0.0-rc.1.20430.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20429.6 to 5.0.0-rc.1.20430.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20430.5 to 5.0.100-rc.1.20431.1 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20430.5 to 5.0.100-rc.1.20431.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.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20429.2 to 5.0.0-rc.1.20430.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20429.5 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 --- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++++----------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69f47ee69..e51557ee5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + 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/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 2cdb97e29152d71ba6b3cda7c65dc8d23cc4874e + 9775d860e5a4767295d9323e82ed4e3cccfd2d70 - + https://github.com/dotnet/sdk - 2cdb97e29152d71ba6b3cda7c65dc8d23cc4874e + 9775d860e5a4767295d9323e82ed4e3cccfd2d70 - + https://github.com/dotnet/winforms - 6186819240e9556694415444e117e148ccf17a8b + 24c51e5fa491fe4b7690115225aa231f1fd7bdad - + https://github.com/dotnet/wpf - 5d292c5f6bfd9c64ac20816f42309213871a0ff4 + 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 diff --git a/eng/Versions.props b/eng/Versions.props index 7a59beee1..ea020e127 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20429.2 + 5.0.0-rc.1.20430.2 - 5.0.0-rc.1.20429.6 + 5.0.0-rc.1.20430.1 @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20430.5 - 5.0.100-rc.1.20430.5 + 5.0.100-rc.1.20431.1 + 5.0.100-rc.1.20431.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 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.20430.1 + 5.0.0-rc.1.20430.1 + 5.0.0-rc.1.20430.1 From 1705c68f58b077b5d43ddeb3dfa8bbf07cddb776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 11:26:27 +0000 Subject: [PATCH 119/140] Update dependencies from https://github.com/dotnet/sdk build 20200831.3 (#8361) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20430.2 to 5.0.0-rc.1.20430.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20431.1 to 5.0.100-rc.1.20431.3 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20431.1 to 5.0.100-rc.1.20431.3 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e51557ee5..de4316f96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 9775d860e5a4767295d9323e82ed4e3cccfd2d70 + 8c541703105866b253a6730601ca60d7cc9cd905 - + https://github.com/dotnet/sdk - 9775d860e5a4767295d9323e82ed4e3cccfd2d70 + 8c541703105866b253a6730601ca60d7cc9cd905 diff --git a/eng/Versions.props b/eng/Versions.props index ea020e127..299b66bcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20431.1 - 5.0.100-rc.1.20431.1 + 5.0.100-rc.1.20431.3 + 5.0.100-rc.1.20431.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5732c59b267b3478766f9a91e41d5fb1aeabcce Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Mon, 31 Aug 2020 11:51:22 -0700 Subject: [PATCH 120/140] Updating bundled versions with 4 part windows versions --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7c6f72967..031cce670 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -281,7 +281,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> Date: Mon, 31 Aug 2020 20:55:40 +0000 Subject: [PATCH 121/140] Update dependencies from https://github.com/dotnet/arcade build 20200831.1 (#8366) [release/5.0.1xx] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Build.Tasks.Installers: 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 | 8 +- eng/Versions.props | 2 +- 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 | 65 +- eng/common/tools.sh | 37 +- global.json | 2 +- 11 files changed, 2004 insertions(+), 69 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 de4316f96..aaebc0529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,13 +98,13 @@ - + 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 299b66bcf..ac2f202c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - 5.0.0-beta.20427.5 + 5.0.0-beta.20431.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 94a91c081..1fd7f686f 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 252b63604..19849adbe 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 000000000..f63b533f2 --- /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 000000000..92161141f --- /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 055304ad8..d0c3cc2b3 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 f91751fe7..428026d2e 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 c2e575c97..1bf215525 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 + create-directory $dotnetroot - $maxRetries = 5 - $retries = 1 + if ($useDefaultDotnetInstall) + { + $progresspreference = 'silentlycontinue' # don't display the console progress ui - it's a huge perf hit - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" + $maxretries = 5 + $retries = 1 - while($true) { - try { - Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript - break + $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." + } } - 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 2be5cba30..c722a0585 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 133b66d4b..1e7b0e89c 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1" } } From 1455151d843009292df355bbb2e094d1741e4d8a Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Mon, 31 Aug 2020 15:41:21 -0700 Subject: [PATCH 122/140] Update cswinrt tests for 4 part version numbers --- test/EndToEnd/GivenWindows50App.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/EndToEnd/GivenWindows50App.cs b/test/EndToEnd/GivenWindows50App.cs index f10c9bdea..51a814fe7 100644 --- a/test/EndToEnd/GivenWindows50App.cs +++ b/test/EndToEnd/GivenWindows50App.cs @@ -13,9 +13,9 @@ namespace EndToEnd public class GivenWindows50App : TestBase { [WindowsOnlyTheory] - [InlineData("10.0.17763")] - [InlineData("10.0.18362")] - [InlineData("10.0.19041")] + [InlineData("10.0.17763.0")] + [InlineData("10.0.18362.0")] + [InlineData("10.0.19041.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 2283b25d6a30a5bf2a2aa45941214fd01d1b852e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 23:37:30 +0000 Subject: [PATCH 123/140] Update dependencies from https://github.com/dotnet/sdk build 20200831.8 (#8367) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20431.3 to 5.0.100-rc.1.20431.8 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20431.3 to 5.0.100-rc.1.20431.8 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20430.6 to 5.0.0-rc.1.20431.5 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aaebc0529..29b0e411d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 4f2e207f37ed38090110ae1635b1d83aba82dd30 - + 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 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 95baa7ae2dca00a29a68b5bad14d8331dd5dc570 + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating 5334768439d060fdbc97779bc687ecbe347dff3d - + https://github.com/dotnet/sdk - 8c541703105866b253a6730601ca60d7cc9cd905 + 5f8d7c862ec39e939a5357b73608026f65949992 - + https://github.com/dotnet/sdk - 8c541703105866b253a6730601ca60d7cc9cd905 + 5f8d7c862ec39e939a5357b73608026f65949992 diff --git a/eng/Versions.props b/eng/Versions.props index ac2f202c2..8a01eed2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20431.3 - 5.0.100-rc.1.20431.3 + 5.0.100-rc.1.20431.8 + 5.0.100-rc.1.20431.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20430.6 + 5.0.0-rc.1.20431.5 - 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.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 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 2.1.0 From fa6078282aef27783420ca45a8e2553f47425ffe Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 31 Aug 2020 09:59:20 -0700 Subject: [PATCH 124/140] Update generatemsi.ps1 --- src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index 6939eb990..8e3f2b965 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -25,7 +25,7 @@ function RunHeat Write-Information "Running heat.." - # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as whitelist name. + # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as exception list name. # Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file # path, and file path has version number) # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. From b303c1b877bd3798f02d4469a3c4d50df33196e1 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:59:25 -0700 Subject: [PATCH 125/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8370) * Update dependencies from https://github.com/dotnet/sdk build 20200831.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.11 * Update dependencies from https://github.com/dotnet/sdk build 20200831.12 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.12 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200831.13 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.13 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200831.15 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.15 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200831.18 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20431.18 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200901.1 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.1 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200901.2 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.2 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200901.3 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.3 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates From Version 5.0.0-rc.1.20431.5 -> To Version 5.0.0-rc.1.20431.14 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200901.4 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20200901.5 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20431.8 -> To Version 5.0.100-rc.1.20451.5 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.DotNet.Common.ItemTemplates,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 5.0.0-rc.1.20430.1 -> To Version 5.0.0-rc.1.20431.13 (parent: Microsoft.NET.Sdk * Fix SDK toolset zip base uri Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell --- eng/Version.Details.xml | 80 +++++++++++------------ eng/Versions.props | 40 ++++++------ src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29b0e411d..780c0c5a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + 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/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 - + https://github.com/dotnet/aspnetcore - d3ebaf0782f79c2ea745102ba71901d5df7ada7e + 7579b300f70e6c61c31d99a6755f0c913b374bf0 https://github.com/dotnet/test-templates @@ -75,26 +75,26 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 5334768439d060fdbc97779bc687ecbe347dff3d + da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 5f8d7c862ec39e939a5357b73608026f65949992 + 0ed2a78ea893c81ad7c8c382743b19089d9bb9b8 - + https://github.com/dotnet/sdk - 5f8d7c862ec39e939a5357b73608026f65949992 + 0ed2a78ea893c81ad7c8c382743b19089d9bb9b8 - + https://github.com/dotnet/winforms - 24c51e5fa491fe4b7690115225aa231f1fd7bdad + e9176d39fa30c6fda81b679274b9316329e0c35e - + https://github.com/dotnet/wpf - 4a8ac67407f9e7f69313c3a6949fa7f9cec9e185 + de2e9785920c11aca594fc3506b8d8052b9b3260 diff --git a/eng/Versions.props b/eng/Versions.props index 8a01eed2d..dc2a3c32f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,15 +21,15 @@ - 5.0.0-rc.1.20430.2 + 5.0.0-rc.1.20431.1 - 5.0.0-rc.1.20430.1 + 5.0.0-rc.1.20431.2 - 5.0.0-rc.1.20428.2 + 5.0.0-rc.1.20431.3 @@ -41,41 +41,41 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20431.8 - 5.0.100-rc.1.20431.8 + 5.0.100-rc.1.20451.5 + 5.0.100-rc.1.20451.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.14 - 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.5 - 5.0.0-rc.1.20431.5 + 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.20431.14 + 5.0.0-rc.1.20431.14 2.1.0 - 5.0.0-rc.1.20430.1 - 5.0.0-rc.1.20430.1 - 5.0.0-rc.1.20430.1 + 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20431.13 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 8efb0277d..ed6f08ec6 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -31,7 +31,7 @@ https://dotnetcli.blob.core.windows.net/dotnet/ https://dotnetcli.blob.core.windows.net/dotnet/ - https://dotnetfeed.blob.core.windows.net/dotnet-core/ + https://dotnetcli.blob.core.windows.net/dotnet/ $(HostRid) $(OSName)-$(Architecture) From 92a426b0fdc653acd4df401dba8404ef9ae536b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 15:48:01 +0000 Subject: [PATCH 126/140] Update dependencies from https://github.com/dotnet/sdk build 20200901.6 (#8376) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20431.24 to 5.0.0-rc.1.20451.2 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20451.5 to 5.0.100-rc.1.20451.6 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20451.5 to 5.0.100-rc.1.20451.6 - Microsoft.AspNetCore.App.Ref: 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 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: 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 - dotnet-user-secrets: 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 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 780c0c5a2..44ab53a57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a - + 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/test-templates @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 0ed2a78ea893c81ad7c8c382743b19089d9bb9b8 + 5cd116897e8cff0ae32a51cf0042a1912f58ef59 - + https://github.com/dotnet/sdk - 0ed2a78ea893c81ad7c8c382743b19089d9bb9b8 + 5cd116897e8cff0ae32a51cf0042a1912f58ef59 diff --git a/eng/Versions.props b/eng/Versions.props index dc2a3c32f..9ae03211f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,20 +41,20 @@ - 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 0.2.0 - 5.0.100-rc.1.20451.5 - 5.0.100-rc.1.20451.5 + 5.0.100-rc.1.20451.6 + 5.0.100-rc.1.20451.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b2bde50b0f578f580fb77b529229290f935bd503 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:26:58 +0000 Subject: [PATCH 127/140] Update dependencies from https://github.com/dotnet/sdk build 20200901.7 (#8378) [release/5.0.1xx] Update dependencies from dotnet/sdk - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20451.6 to 5.0.100-rc.1.20451.7 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20451.6 to 5.0.100-rc.1.20451.7 --- 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 44ab53a57..0aa3ed8da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 5cd116897e8cff0ae32a51cf0042a1912f58ef59 + 9d1d639165b8c87bb2e319cdd295b81a4240bb40 - + https://github.com/dotnet/sdk - 5cd116897e8cff0ae32a51cf0042a1912f58ef59 + 9d1d639165b8c87bb2e319cdd295b81a4240bb40 diff --git a/eng/Versions.props b/eng/Versions.props index 9ae03211f..2692a28fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20451.6 - 5.0.100-rc.1.20451.6 + 5.0.100-rc.1.20451.7 + 5.0.100-rc.1.20451.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f96329de86b9624970120169131f0dbfa7b81f9f Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 1 Sep 2020 11:29:03 -0500 Subject: [PATCH 128/140] [release/5.0.1xx] Add arcade-powered source-build strict coherent parent dependencies (#8377) --- eng/Version.Details.xml | 49 +++++++++++++++++++++++++++++++++++++++++ eng/Versions.props | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0aa3ed8da..f0a36edda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -96,6 +96,43 @@ https://github.com/dotnet/wpf de2e9785920c11aca594fc3506b8d8052b9b3260 + + https://github.com/dotnet/fsharp + 068ebd3c599bc5a47163a18b8b90d2fe5517186e + + + https://github.com/microsoft/vstest + 4fcacb284064e66e670689b9888c0c438b1f4154 + + + https://github.com/mono/linker + 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 + linker + + + https://github.com/dotnet/roslyn + 82b3b1f2d95299c9f511069eff25d0501fc2421d + + + https://github.com/dotnet/msbuild + d58e2b7864627321d75b7a47850e9b80deac7db6 + + + https://github.com/NuGet/NuGet.Client + 3501ddedc274ac10d4b135856b7593a6bb8a72f1 + + + https://github.com/dotnet/CliCommandLineParser + 0e89c2116ad28e404ba56c14d1c3f938caa25a01 + + + https://github.com/Microsoft/ApplicationInsights-dotnet + 53b80940842204f78708a538628288ff5d741a1d + + + https://github.com/aspnet/xdt + c01a538851a8ab1a1fbeb2e6243f391fff7587b4 + @@ -106,5 +143,17 @@ https://github.com/dotnet/arcade 4be47e467013f8a07a1ed7b6e49e39c8150bde54 + + https://github.com/dotnet/source-build-reference-packages + 639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1 + + + https://github.com/dotnet/sourcelink + db7c31800400b6203d2b162255fa46cbaf2f04aa + + + https://github.com/dotnet/xliff-tasks + 975065e08307a459dc2649b1c852f5c4cafd2f91 + diff --git a/eng/Versions.props b/eng/Versions.props index 2692a28fa..dab06af60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ 2.2.0-beta.19072.10 2.0.0 - 15.8.0 + 16.8.0-release-20200828-02 10.0.17763.1-preview From f6f886a168cfa026ce53a979bc4fbfbd8bd73f4c Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 1 Sep 2020 13:45:40 -0700 Subject: [PATCH 129/140] Update first run message (#8379) --- src/redist/targets/packaging/deb/postinst | 2 +- src/redist/targets/packaging/rpm/scripts/after_install_host.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/deb/postinst b/src/redist/targets/packaging/deb/postinst index 4356a52e6..142daff4e 100644 --- a/src/redist/targets/packaging/deb/postinst +++ b/src/redist/targets/packaging/deb/postinst @@ -10,7 +10,7 @@ Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cl Telemetry --------- -The .NET 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. +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/redist/targets/packaging/rpm/scripts/after_install_host.sh b/src/redist/targets/packaging/rpm/scripts/after_install_host.sh index dbc0dabbe..b3560eabc 100644 --- a/src/redist/targets/packaging/rpm/scripts/after_install_host.sh +++ b/src/redist/targets/packaging/rpm/scripts/after_install_host.sh @@ -14,7 +14,7 @@ Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cl Telemetry --------- -The .NET 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. +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 4fcc58d7954c4362493d73f1a92957e7b338eb26 Mon Sep 17 00:00:00 2001 From: William Li Date: Tue, 1 Sep 2020 21:50:58 -0700 Subject: [PATCH 130/140] Update Microsoft.Windows.SDK.NET.Ref versions --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dab06af60..1161a540e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,9 +127,9 @@ 16.8.0-release-20200828-02 - 10.0.17763.1-preview - 10.0.18362.2-preview - 10.0.19041.1-preview + 10.0.17763.2-preview + 10.0.18362.3-preview + 10.0.19041.2-preview From 3e171f435e49c0d5eaec68aa10bf2aa4408e8c0a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 2 Sep 2020 09:05:29 -0700 Subject: [PATCH 131/140] Pin Xdt until strict coherency is enabled (#8383) Because Xdt doesn't have a build associated with it, legacy coherency cannot satisfy this dependency. For now, pin Xdt until strict coherency is the default. Co-authored-by: dotnet-bot --- eng/Version.Details.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0a36edda..6cb7f59dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -129,7 +129,8 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + + https://github.com/aspnet/xdt c01a538851a8ab1a1fbeb2e6243f391fff7587b4 From dff9243510cfaacacce0ec0b4100581ffb308772 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 16:39:08 +0000 Subject: [PATCH 132/140] Update dependencies from https://github.com/dotnet/sdk build 20200902.9 (#8384) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20452.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20451-02 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.1.20452.9 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20451.7 to 5.0.100-rc.1.20452.9 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20431.14 to 5.0.0-rc.1.20451.14 - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - dotnet-dev-certs: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - dotnet-user-secrets: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - dotnet-watch: from 5.0.0-rc.1.20451.2 to 5.0.0-rc.1.20451.17 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20431.1 to 5.0.0-rc.1.20451.4 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20431.13 to 5.0.0-rc.1.20451.14 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20431.2 to 5.0.0-rc.1.20451.4 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20420.1 to 3.8.0-3.20452.1 - Microsoft.Build: from 16.8.0-preview-20429-01 to 16.8.0-preview-20451-02 - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 --- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb7f59dc..db2133ed6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 3b198e9a3edaf7e183580e1d95d720d03f944447 - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 3b198e9a3edaf7e183580e1d95d720d03f944447 - + https://github.com/dotnet/windowsdesktop - 7e542661acee7dea547ff4466ffe6ea232e81fb3 + 3b198e9a3edaf7e183580e1d95d720d03f944447 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 3bcbbd5b74cbeaae26b85e1b93bc65c6a046259a + 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 - + https://github.com/dotnet/aspnetcore - a7a2800658c313bc68de7c29ce735e9dad0ea1ed + ecdcc752d4639061c2c49727ee77a1039bbbca22 https://github.com/dotnet/test-templates @@ -79,22 +79,22 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 9d1d639165b8c87bb2e319cdd295b81a4240bb40 + 478b25d4609593c07bab37969641631f461ebb16 - + https://github.com/dotnet/sdk - 9d1d639165b8c87bb2e319cdd295b81a4240bb40 + 478b25d4609593c07bab37969641631f461ebb16 - + https://github.com/dotnet/winforms - e9176d39fa30c6fda81b679274b9316329e0c35e + 8c52921c5371cfb864442491a8d89739296a75f2 - + https://github.com/dotnet/wpf - de2e9785920c11aca594fc3506b8d8052b9b3260 + 48bea1ca59aae317957fea2d573395ee9edc21d4 https://github.com/dotnet/fsharp @@ -109,20 +109,20 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - 82b3b1f2d95299c9f511069eff25d0501fc2421d + 33457b20f638f64b56ed9b9517926d7f36eb7321 - + https://github.com/dotnet/msbuild - d58e2b7864627321d75b7a47850e9b80deac7db6 + 51a1071f8871e0c93afbaf1b2ac2c9e59c7b6491 https://github.com/NuGet/NuGet.Client 3501ddedc274ac10d4b135856b7593a6bb8a72f1 - https://github.com/dotnet/CliCommandLineParser + https://github.com/dotnet/cliCommandLineParser 0e89c2116ad28e404ba56c14d1c3f938caa25a01 diff --git a/eng/Versions.props b/eng/Versions.props index 1161a540e..f31e46652 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20431.1 + 5.0.0-rc.1.20451.4 - 5.0.0-rc.1.20431.2 + 5.0.0-rc.1.20451.4 @@ -41,41 +41,41 @@ - 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.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 0.2.0 - 5.0.100-rc.1.20451.7 - 5.0.100-rc.1.20451.7 + 5.0.100-rc.1.20452.9 + 5.0.100-rc.1.20452.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.14 - 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.20431.14 - 5.0.0-rc.1.20431.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 2.1.0 - 5.0.0-rc.1.20431.13 - 5.0.0-rc.1.20431.13 - 5.0.0-rc.1.20431.13 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20451.14 From 30ef9efad6cd89531d41f42d253b23586ec21009 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Sep 2020 16:40:21 +0000 Subject: [PATCH 133/140] Update dependencies from https://github.com/dotnet/sdk build 20200902.11 Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 5.0.100-rc.1.20452.9 -> To Version 5.0.100-rc.1.20452.11 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 16.8.0-release-20200828-02 -> To Version 16.8.0-release-20200902-05 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db2133ed6..ef4e536da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 478b25d4609593c07bab37969641631f461ebb16 + 67b05a26c70a6443199260cf5a4c034d34bc015d - + https://github.com/dotnet/sdk - 478b25d4609593c07bab37969641631f461ebb16 + 67b05a26c70a6443199260cf5a4c034d34bc015d @@ -100,9 +100,9 @@ https://github.com/dotnet/fsharp 068ebd3c599bc5a47163a18b8b90d2fe5517186e - + https://github.com/microsoft/vstest - 4fcacb284064e66e670689b9888c0c438b1f4154 + 0c0fafa64de5c73981e7c40a99d7363f57635f60 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index f31e46652..3aa3f50af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20452.9 - 5.0.100-rc.1.20452.9 + 5.0.100-rc.1.20452.11 + 5.0.100-rc.1.20452.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -124,7 +124,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.8.0-release-20200828-02 + 16.8.0-release-20200902-05 10.0.17763.2-preview From 31c72088794091600de109245188c37e7dc03816 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 20:27:23 +0000 Subject: [PATCH 134/140] Update dependencies from https://github.com/dotnet/sdk build 20200902.15 (#8386) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20451.4 to 5.0.0-rc.1.20451.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20451.4 to 5.0.0-rc.1.20451.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20452.11 to 5.0.100-rc.1.20452.15 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20452.11 to 5.0.100-rc.1.20452.15 - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20451.4 to 5.0.0-rc.1.20451.14 - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.2 - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20451.4 to 5.0.0-rc.1.20451.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef4e536da..ffc3bd9d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + 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/runtime @@ -79,22 +79,22 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 67b05a26c70a6443199260cf5a4c034d34bc015d + 69d301a57254028719f23907925d9a2bc3af1e6e - + https://github.com/dotnet/sdk - 67b05a26c70a6443199260cf5a4c034d34bc015d + 69d301a57254028719f23907925d9a2bc3af1e6e - + https://github.com/dotnet/winforms - 8c52921c5371cfb864442491a8d89739296a75f2 + 97d99ec9e047dcdff90185bfd0bbe9f26b7be62f - + https://github.com/dotnet/wpf - 48bea1ca59aae317957fea2d573395ee9edc21d4 + be89bbfaded6ad3f0f4143bf1a8dd075a5789715 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3aa3f50af..03371e6ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,11 @@ - 5.0.0-rc.1.20451.4 + 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.4 + 5.0.0-rc.1.20451.6 @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20452.11 - 5.0.100-rc.1.20452.11 + 5.0.100-rc.1.20452.15 + 5.0.100-rc.1.20452.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -73,9 +73,9 @@ - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20452.2 + 5.0.0-rc.1.20452.2 + 5.0.0-rc.1.20452.2 From 29d2c9ab55b33446174ab1aa73cb664a7d247b88 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Wed, 2 Sep 2020 18:46:57 -0700 Subject: [PATCH 135/140] Update Microsoft.Windows.SDK.NET.Ref versions Packages were rebuilt, updating to new version. --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 03371e6ff..cca023e00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,9 +127,9 @@ 16.8.0-release-20200902-05 - 10.0.17763.2-preview - 10.0.18362.3-preview - 10.0.19041.2-preview + 10.0.17763.3-preview + 10.0.18362.4-preview + 10.0.19041.3-preview From 1e456e21c8b3b3a7380c4fe5d6041bb1c2170064 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 2 Sep 2020 20:16:34 -0700 Subject: [PATCH 136/140] Ensure 3rd party assemblies are signed --- src/redist/targets/Signing.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets index 8a19cab96..a4d986179 100644 --- a/src/redist/targets/Signing.targets +++ b/src/redist/targets/Signing.targets @@ -86,7 +86,11 @@ - + $(ExternalCertificateId) From 4a80fb62582719b623dd87739e9ed6b464035f7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2020 04:03:35 +0000 Subject: [PATCH 137/140] Update dependencies from https://github.com/dotnet/sdk build 20200902.20 (#8391) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20452.1 to 3.8.0-3.20452.3 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20452.15 to 5.0.100-rc.1.20452.20 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20452.15 to 5.0.100-rc.1.20452.20 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20452.1 to 3.8.0-3.20452.3 --- 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 ffc3bd9d1..5f375c98b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 69d301a57254028719f23907925d9a2bc3af1e6e + 394fae2553937858c8f05a6158613dcc7f821fba - + https://github.com/dotnet/sdk - 69d301a57254028719f23907925d9a2bc3af1e6e + 394fae2553937858c8f05a6158613dcc7f821fba @@ -109,9 +109,9 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - 33457b20f638f64b56ed9b9517926d7f36eb7321 + 90e570d763637c4d0d30524674a64b07bb885994 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 03371e6ff..9ebd055f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20452.15 - 5.0.100-rc.1.20452.15 + 5.0.100-rc.1.20452.20 + 5.0.100-rc.1.20452.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ac636a6390381dba1bb8d245db73a44344bdb244 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2020 08:24:31 +0000 Subject: [PATCH 138/140] [release/5.0.1xx] Update dependencies from dotnet/sdk (#8392) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20452.1 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20452.20 to 5.0.100-rc.1.20453.1 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20452.20 to 5.0.100-rc.1.20453.1 - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20451.14 to 5.0.0-rc.1.20452.14 - Microsoft.FSharp.Compiler: from 11.0.0-beta.20428.2 to 11.0.0-beta.20452.1 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f375c98b..576e111b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop 9ea6951cdc8e275e30901a51be700e88d03c4bb9 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 38017c3935de95d0335bac04f4901ddfc2718656 + d2e8221c4d18df2f01010eb3867f989fe9cfc7b3 https://github.com/dotnet/aspnetcore @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 394fae2553937858c8f05a6158613dcc7f821fba + 51bbd776df400c51154f3ec265f16c13ebb2e6fb - + https://github.com/dotnet/sdk - 394fae2553937858c8f05a6158613dcc7f821fba + 51bbd776df400c51154f3ec265f16c13ebb2e6fb @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf be89bbfaded6ad3f0f4143bf1a8dd075a5789715 - + https://github.com/dotnet/fsharp - 068ebd3c599bc5a47163a18b8b90d2fe5517186e + 535ad98648b46b79559caba91f98fe63a4e260ca https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 8d230533e..b7c84bdc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,22 +53,22 @@ - 5.0.100-rc.1.20452.20 - 5.0.100-rc.1.20452.20 + 5.0.100-rc.1.20453.1 + 5.0.100-rc.1.20453.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20452.14 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 - 5.0.0-rc.1.20451.14 + 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20452.14 + 5.0.0-rc.1.20452.14 2.1.0 From d340505ecc201561100c964c6d21f8f6ecde4278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2020 11:35:12 +0000 Subject: [PATCH 139/140] Update dependencies from https://github.com/dotnet/sdk build 20200903.6 (#8394) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 11.0.0-beta.20452.1 to 11.0.0-beta.20452.4 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20453.1 to 5.0.100-rc.1.20453.6 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20453.1 to 5.0.100-rc.1.20453.6 - Microsoft.FSharp.Compiler: from 11.0.0-beta.20452.1 to 11.0.0-beta.20452.4 --- 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 576e111b2..3d9719bd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - 51bbd776df400c51154f3ec265f16c13ebb2e6fb + cafa7bc6ef438e19f79583bbaeeb0342db10d274 - + https://github.com/dotnet/sdk - 51bbd776df400c51154f3ec265f16c13ebb2e6fb + cafa7bc6ef438e19f79583bbaeeb0342db10d274 @@ -96,9 +96,9 @@ https://github.com/dotnet/wpf be89bbfaded6ad3f0f4143bf1a8dd075a5789715 - + https://github.com/dotnet/fsharp - 535ad98648b46b79559caba91f98fe63a4e260ca + 918387ac7303945695a8ea92dc02a9dbcfdc0c92 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b7c84bdc4..b6f3f08ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20453.1 - 5.0.100-rc.1.20453.1 + 5.0.100-rc.1.20453.6 + 5.0.100-rc.1.20453.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c0ca479889e5bbd34e8c499e7e17848f36a0862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Sep 2020 12:23:36 +0000 Subject: [PATCH 140/140] Update dependencies from https://github.com/dotnet/sdk build 20200903.7 (#8395) [release/5.0.1xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20452.3 to 3.8.0-3.20453.2 (parent: Microsoft.NET.Sdk) - Updates: - Microsoft.NET.Sdk: from 5.0.100-rc.1.20453.6 to 5.0.100-rc.1.20453.7 - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20453.6 to 5.0.100-rc.1.20453.7 - Microsoft.Net.Compilers.Toolset: from 3.8.0-3.20452.3 to 3.8.0-3.20453.2 --- 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 3d9719bd0..5c4102b1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating da62f3656cac0ac4bfb6b012bc072b3499f78e6c - + https://github.com/dotnet/sdk - cafa7bc6ef438e19f79583bbaeeb0342db10d274 + 1c6403afced118a403dfd03f997d8704820c5a94 - + https://github.com/dotnet/sdk - cafa7bc6ef438e19f79583bbaeeb0342db10d274 + 1c6403afced118a403dfd03f997d8704820c5a94 @@ -109,9 +109,9 @@ 863b5502cc43b1c75b5a93ac395899f8d8b5f0a4 linker - + https://github.com/dotnet/roslyn - 90e570d763637c4d0d30524674a64b07bb885994 + e78b37e454b97aba60afe28def2d5a7a3f1a372d https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index b6f3f08ca..858fc90bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,8 +53,8 @@ - 5.0.100-rc.1.20453.6 - 5.0.100-rc.1.20453.6 + 5.0.100-rc.1.20453.7 + 5.0.100-rc.1.20453.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)