From 0ff95eba8e85f18ec72bbdeb681a95ce9e6717b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 21:24:58 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.23221.7 -> To Version 6.0.0-beta.23313.5 --- eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/templates/job/job.yml | 16 ++++--- global.json | 12 ++--- 4 files changed, 70 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2319972b1fa256..5b47c072f6d7f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness bc2e9e39a7b424f6e96af8d677d12ac58606753a - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 478a5adaa1aa5c..ba9d914352b0d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 2.5.1-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 - 6.0.0-beta.23221.7 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 2.5.1-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 + 6.0.0-beta.23313.5 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e5784440d0bb29..0e10e7db69c77a 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -144,15 +148,17 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -220,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -231,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/global.json b/global.json index 49180d70c9d093..51640c121ac78b 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.116", + "version": "6.0.118", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.116" + "dotnet": "6.0.118" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23221.7", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23221.7", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23313.5", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" From a80cae5051b1aa09930844784ad2ec8f59ff0d0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 22:37:26 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/icu build 20230615.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.23218.5 -> To Version 6.0.0-rtm.23315.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b47c072f6d7f2..2aa0418c8a4e77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - cff1c9ff20d271c6698d150e484e8327998595a4 + 18b103db239331f9b917e741b13c95eddf32f6df https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index ba9d914352b0d2..9c4475029b089d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ 6.0.100-1.21459.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rtm.23218.5 + 6.0.0-rtm.23315.1 6.0.0-servicing.22205.1 From 3d94ace4eaeccb345dcde4c88a14983f982b40b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Jun 2023 15:04:24 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/hotreload-utils build 20230616.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 6.0.0-alpha.0.23226.4 -> To Version 6.0.0-alpha.0.23316.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2aa0418c8a4e77..21e30a9c233e14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,9 +242,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d50065944d8b41d804448a7056351481d583ad3d - + https://github.com/dotnet/hotreload-utils - 83c5bd71b65d9de362ae0ba2f2cdea94c002c8c7 + 2293d2ba069595f1c87f4e002c84cbab7201bfe7 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 9c4475029b089d..9e8821a0f373db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,7 @@ 17.4.0-preview-20220707-01 6.0.0-prerelease.23253.6 6.0.0-prerelease.23253.6 - 6.0.0-alpha.0.23226.4 + 6.0.0-alpha.0.23316.3 2.4.2-pre.9 2.4.2 1.3.0 From b3ac151914eb0cd5ccc41a72e9b4ce49528703fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Jun 2023 15:20:39 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/emsdk build 20230616.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.19 -> To Version 6.0.19 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d4f22f6ccf379..a503818eb59b43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21e30a9c233e14..cb298f2fb59ec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,15 +10,15 @@ https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 095496cdcc3a53190b507b5bb6f4d164c2f47eed https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 095496cdcc3a53190b507b5bb6f4d164c2f47eed https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 095496cdcc3a53190b507b5bb6f4d164c2f47eed https://github.com/dotnet/wcf From 3d913236d7f132d241f67cc4155232cf485061e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jun 2023 13:16:27 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb298f2fb59ec8..b006566e932be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,49 +102,49 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 https://github.com/dotnet/llvm-project @@ -246,9 +246,9 @@ https://github.com/dotnet/hotreload-utils 2293d2ba069595f1c87f4e002c84cbab7201bfe7 - + https://github.com/dotnet/runtime-assets - 27b0291e9fb85b6664e4fc7c6bc10bcd059d8ab7 + 60b420e88cdd0ec0becb2115e14288adc1a1cb55 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 9e8821a0f373db..bdc520b4b2ce14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,18 +108,18 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 - 6.0.0-beta.23212.1 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 + 6.0.0-beta.23316.2 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 From 8caaf0555eff15e9b0fe32895707effe97a897c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Jun 2023 09:39:54 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/emsdk build 20230620.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.19 -> To Version 6.0.20 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index a503818eb59b43..90e21e18c5bffd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b006566e932be2..96e92525bd5c19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 7312355e44fd230b7aa26c7190f3870391751476 - + https://github.com/dotnet/emsdk - 095496cdcc3a53190b507b5bb6f4d164c2f47eed + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 - + https://github.com/dotnet/emsdk - 095496cdcc3a53190b507b5bb6f4d164c2f47eed + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 - + https://github.com/dotnet/emsdk - 095496cdcc3a53190b507b5bb6f4d164c2f47eed + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index bdc520b4b2ce14..3620f6640836b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20 + 6.0.20 + 6.0.20 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda From a408e1752cd6e66a3e1a505d05b4c23a15c460e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jun 2023 12:44:19 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 From 0da0d01694de509d7b43b5a193a5f5db881af4a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jun 2023 12:44:58 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 90e21e18c5bffd..028e9629c1528a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + From b8c0345e388fc2bb322a5c035d28df8f77b43ab0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jun 2023 13:16:06 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/runtime-assets build 20230616.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.23212.1 -> To Version 6.0.0-beta.23316.2 --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 028e9629c1528a..d5dbd101f043e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,8 +9,6 @@ - - From 25891659412e2e70b7d0a5139937eae08ce77039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Jul 2023 18:55:01 +0000 Subject: [PATCH 10/10] Update dependencies from https://github.com/dotnet/emsdk build 20230707.3 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.20 -> To Version 6.0.21 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index d5dbd101f043e1..6544a77805caf6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05269b3fe9e671..e04ddefbde4dcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 7312355e44fd230b7aa26c7190f3870391751476 - + https://github.com/dotnet/emsdk - 6c7f38c614304c93cd392907df7d5e770d5cf7f1 + 864fae9e00da58498da19b40d46be706a9bf5f47 - + https://github.com/dotnet/emsdk - 6c7f38c614304c93cd392907df7d5e770d5cf7f1 + 864fae9e00da58498da19b40d46be706a9bf5f47 - + https://github.com/dotnet/emsdk - 6c7f38c614304c93cd392907df7d5e770d5cf7f1 + 864fae9e00da58498da19b40d46be706a9bf5f47 https://github.com/dotnet/wcf diff --git a/eng/Versions.props b/eng/Versions.props index fb3f15b7352352..d2f177fbc68589 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,9 +175,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.20 - 6.0.20 - 6.0.20 + 6.0.21 + 6.0.21 + 6.0.21 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda