From 5cae2790d7a6079830bf319ba1c6207483639729 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Jun 2023 22:36:12 +0000 Subject: [PATCH 01/21] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfabbd633..c68a71688 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,18 @@ + + - - - @@ -41,15 +40,14 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e812a0193..21a39af7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 61b9e8db59eccd3a3a20b247a54896dd977e134d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 + 8cc6c4455b64f468949454aa00508a5ab6b0bb31 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0916fe56744d1c533e4a15aaa7293e6fa7b92b99 + 8cc6c4455b64f468949454aa00508a5ab6b0bb31 diff --git a/eng/Versions.props b/eng/Versions.props index 8382e79c3..4092c219d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.313-servicing.23272.30 - 6.0.313-servicing.23272.30 + 6.0.314-servicing.23314.11 + 6.0.314-servicing.23314.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 50296d00ff433d96ae35d19d9dbeee8dcb815324 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Jun 2023 08:03:53 +0000 Subject: [PATCH 02/21] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9a62b5fa1..89807813d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,20 +8,21 @@ + + + + - - - @@ -42,17 +43,16 @@ + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87d6419c2..93bae3f3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating a23430d931218c8b2ffe6a51d120cd12fccece49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 597ab8665d3b6fa5d1bad36724a3303aac430a5e + acf99d36ad40ff0ab2452d6b840c63df05a8f8cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 597ab8665d3b6fa5d1bad36724a3303aac430a5e + acf99d36ad40ff0ab2452d6b840c63df05a8f8cf diff --git a/eng/Versions.props b/eng/Versions.props index 0febd3d43..0a93c2407 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.118-servicing.23272.29 - 6.0.118-servicing.23272.29 + 6.0.119-servicing.23314.10 + 6.0.119-servicing.23314.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 717240d06509b180f3cafb7a29b67688de067fc7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 15 Jun 2023 22:02:18 +0000 Subject: [PATCH 03/21] [internal/release/6.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++------ .../templates/steps/component-governance.yml | 10 +++++++ global.json | 6 ++--- 5 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21a39af7e..26b3bfde8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 4092c219d..5cb7f0b36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23211.7 + 6.0.0-beta.23313.5 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da..0e10e7db6 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -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 }} @@ -141,14 +145,20 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - 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(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: @@ -216,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 }} @@ -227,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/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 1f0711594..b358f87d3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23313.5" } } From da2f85050991e590452392a0c97ecc37c8da45ef Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 19:25:45 +0000 Subject: [PATCH 04/21] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23315.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23313.28 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.313-servicing.23272.6 to 6.0.314-servicing.23314.10 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.313 to 6.0.314 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 14 +++--- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 79 insertions(+), 77 deletions(-) diff --git a/NuGet.config b/NuGet.config index c68a71688..730cfe99d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,20 @@ - - - + + + + @@ -40,14 +41,15 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26b3bfde8..5fc2cc077 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 61b9e8db59eccd3a3a20b247a54896dd977e134d + 51a3e30097b11df176bb610b54f099cd75afda69 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cc6c4455b64f468949454aa00508a5ab6b0bb31 + 33f94c3e68d8ffaf2ce97293d47c33d73031e630 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cc6c4455b64f468949454aa00508a5ab6b0bb31 + 33f94c3e68d8ffaf2ce97293d47c33d73031e630 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a29a62bc7aa91d9e7509261a138af3c27c0506ea + 80d0a961366ba61097c1e1b51ad47466984d734e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5cb7f0b36..dae35afdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23314.6 - 6.0.18-servicing.23272.2 + 6.0.19-servicing.23314.6 - 6.0.313 + 6.0.314 @@ -44,44 +44,44 @@ - 6.0.18 - 6.0.18 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 + 6.0.19 + 6.0.19 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 + 6.0.19-servicing.23313.28 0.2.0 - 6.0.314-servicing.23314.11 - 6.0.314-servicing.23314.11 + 6.0.314-servicing.23315.34 + 6.0.314-servicing.23315.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.10 + 6.0.11 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.19 + 6.0.19 2.1.0 - 6.0.18-servicing.23272.2 - 6.0.18-servicing.23272.2 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23315.1 + 6.0.19-servicing.23315.1 + 6.0.19 + 6.0.19 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.313 + 6.0.314 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 1f8fa50d1b30daf201abff07135d2626fb209ec7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 22:32:11 +0000 Subject: [PATCH 05/21] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 730cfe99d..c8000546d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + @@ -41,15 +41,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fc2cc077..45500982b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b7e2844d61ca8a1c262bf6e7c39eef16ae51a58 + 23b442c3594414a52a901c710902639653c94b8d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a323b07e4fa4eb96e1d9e632910a7b0069a02d8 + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 51a3e30097b11df176bb610b54f099cd75afda69 + 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33f94c3e68d8ffaf2ce97293d47c33d73031e630 + d410e6f94041b08f891a838cb3867b924b57089f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 33f94c3e68d8ffaf2ce97293d47c33d73031e630 + d410e6f94041b08f891a838cb3867b924b57089f diff --git a/eng/Versions.props b/eng/Versions.props index dae35afdf..830cd0a00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 - 6.0.19-servicing.23313.28 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 0.2.0 - 6.0.314-servicing.23315.34 - 6.0.314-servicing.23315.34 + 6.0.314-servicing.23316.42 + 6.0.314-servicing.23316.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23315.1 - 6.0.19-servicing.23315.1 + 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.3 6.0.19 6.0.19 From 33c72df7e27650deb63c076c51ee85f795e0d669 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Jun 2023 22:41:44 +0000 Subject: [PATCH 06/21] [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23316.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.10 to 6.0.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.18-servicing.23269.9 to 6.0.19-servicing.23315.15 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.118 to 6.0.119 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.118-servicing.23272.5 to 6.0.119-servicing.23316.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.118 to 6.0.119 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.18-servicing.23272.1 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.18 to 6.0.19 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.18-servicing.23272.2 to 6.0.19-servicing.23314.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.18-servicing.23269.7 to 6.0.19-servicing.23313.25 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.18 to 6.0.19 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) --- NuGet.config | 18 ++++---- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 89807813d..4de6c3e72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,21 @@ - - - + - - - + + + + @@ -43,16 +42,17 @@ - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae4ae60d9..8ee520667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 44b3a005f161dfc735446e61cbf1e792124170da + 23b442c3594414a52a901c710902639653c94b8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + fcf11495c6989362aa1012dc0d303ce619413624 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - be51b1aa73343e45a1d00afd436abad794f471fb + 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 29df36ca29205741afa9234e7d0ca702b05fd5aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 29df36ca29205741afa9234e7d0ca702b05fd5aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a23430d931218c8b2ffe6a51d120cd12fccece49 + 29df36ca29205741afa9234e7d0ca702b05fd5aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acf99d36ad40ff0ab2452d6b840c63df05a8f8cf + 81aeb40680f6bba69c2e375bdf618aa2a92e0cb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acf99d36ad40ff0ab2452d6b840c63df05a8f8cf + 81aeb40680f6bba69c2e375bdf618aa2a92e0cb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 865895cec5e8dc357b65c98a4a7af58643d10997 + b1b9ae8774dbff146d4a0149a85229360e1d5dfd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a29a62bc7aa91d9e7509261a138af3c27c0506ea + 80d0a961366ba61097c1e1b51ad47466984d734e https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - a91ee4835f3c2bb33a4295ba3aae43479b50564d + 0e3ff3ea9054b5ab771db20d5a87923d97287bdb https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index d889d94fc..1492109f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.18-servicing.23272.1 + 6.0.19-servicing.23314.6 - 6.0.18-servicing.23272.2 + 6.0.19-servicing.23314.6 - 6.0.118 + 6.0.119 @@ -44,44 +44,44 @@ - 6.0.18 - 6.0.18 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 - 6.0.18-servicing.23269.9 + 6.0.19 + 6.0.19 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 + 6.0.19-servicing.23315.15 0.2.0 - 6.0.119-servicing.23314.10 - 6.0.119-servicing.23314.10 + 6.0.119-servicing.23316.37 + 6.0.119-servicing.23316.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.10 + 6.0.11 - 6.0.18-servicing.23269.7 - 6.0.18-servicing.23269.7 - 6.0.18 - 6.0.18 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23313.25 + 6.0.19-servicing.23313.25 + 6.0.19 + 6.0.19 + 6.0.19 + 6.0.19 2.1.0 - 6.0.18-servicing.23272.2 - 6.0.18-servicing.23272.2 - 6.0.18 - 6.0.18 + 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.3 + 6.0.19 + 6.0.19 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.118 + 6.0.119 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.18 + 6.0.19 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 1fb1cc9b9780adc88a3a9622546c60c13b40561e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:18:36 +0000 Subject: [PATCH 07/21] Merged PR 32042: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230619.17 - **Date Produced**: June 19, 2023 4:53:03 PM UTC - **Commit**: d522678314f3caedeb106994f0198cc62f807ea9 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.314-servicing.23316.42 to 6.0.314-servicing.23319.17][1] - **Microsoft.NET.Sdk**: [from 6.0.314-servicing.23316.42 to 6.0.314-servicing.23319.17][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8000546d..ad23de3e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45500982b..d1a6a14eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d410e6f94041b08f891a838cb3867b924b57089f + b85af7cbbb6fabe77fc290780c3f15f0627d296f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d410e6f94041b08f891a838cb3867b924b57089f + b85af7cbbb6fabe77fc290780c3f15f0627d296f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 80d0a961366ba61097c1e1b51ad47466984d734e + b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 99f038044..756b5ea96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.8 @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 0.2.0 - 6.0.314-servicing.23316.42 - 6.0.314-servicing.23316.42 + 6.0.315-servicing.23319.32 + 6.0.315-servicing.23319.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23316.3 - 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.11 + 6.0.19-servicing.23316.11 6.0.19 6.0.19 From 0e7bd77ab9bb4396b566a1df67e3fcd9fe864748 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 19:18:48 +0000 Subject: [PATCH 08/21] Merged PR 32041: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.3 to 6.0.19-servicing.23316.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23315.15 to 6.0.19-servicing.23316.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23314.6 to 6.0.19-servicing.23316.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230619.16 - **Date Produced**: June 19, 2023 4:50:26 PM UTC - **Commit**: 21879f2647a3b78949377d85be211e5e324fc700 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.119-servicing.23316.37 to 6.0.119-servicing.23319.16][1] - **Microsoft.NET.Sdk**: [from 6.0.119-servicing.23316.37 to 6.0.119-servicing.23319.16][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.19 to 6.0.19][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.19-servi... --- NuGet.config | 10 +++++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4de6c3e72..7aad1ea7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,12 @@ - + + + @@ -21,7 +23,7 @@ - + @@ -42,7 +44,7 @@ - + @@ -52,7 +54,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ee520667..c753e6f0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 23b442c3594414a52a901c710902639653c94b8d + 964405678d47972b5a16730e00de42efaaecd351 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 191dd6b449e2a4fba83d3d7ad8c6b9b5ecbe8cb2 + bb66e68e5bfcf21879413b98962542bda9f66381 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 29df36ca29205741afa9234e7d0ca702b05fd5aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81aeb40680f6bba69c2e375bdf618aa2a92e0cb0 + 86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81aeb40680f6bba69c2e375bdf618aa2a92e0cb0 + 86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b1b9ae8774dbff146d4a0149a85229360e1d5dfd + 4e9cc74519c57c5c4913459618f0dab2d6696ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 80d0a961366ba61097c1e1b51ad47466984d734e + b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f974b3f9a..d3978c97a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.2 - 6.0.19-servicing.23314.6 + 6.0.19-servicing.23316.8 @@ -46,18 +46,18 @@ 6.0.19 6.0.19 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 - 6.0.19-servicing.23315.15 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 + 6.0.19-servicing.23316.4 0.2.0 - 6.0.119-servicing.23316.37 - 6.0.119-servicing.23316.37 + 6.0.120-servicing.23319.34 + 6.0.120-servicing.23319.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.19-servicing.23316.3 - 6.0.19-servicing.23316.3 + 6.0.19-servicing.23316.11 + 6.0.19-servicing.23316.11 6.0.19 6.0.19 From b8cb60edae8ea694b2a05707eb3c005deb5da793 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Jun 2023 20:51:31 +0000 Subject: [PATCH 09/21] Merged PR 32122: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23319.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.314-servicing.23316.16 to 6.0.315-servicing.23320.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.314 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (B... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 40 +++++++++---------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad23de3e8..49bd305f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1a6a14eb..9035638c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + c34980ca5ff05b3673b08399dbe40e0d027d14bd https://github.com/dotnet/test-templates @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 6cc000b3880c4f9ef1a767c11e558ea6ef9df712 + e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b85af7cbbb6fabe77fc290780c3f15f0627d296f + e08ea90cf3c415461f5bd983e9e6861b5b62e895 diff --git a/eng/Versions.props b/eng/Versions.props index 756b5ea96..e38d20678 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.314 + 6.0.315 @@ -44,20 +44,20 @@ - 6.0.19 - 6.0.19 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 0.2.0 - 6.0.315-servicing.23319.32 - 6.0.315-servicing.23319.32 + 6.0.315-servicing.23321.9 + 6.0.315-servicing.23321.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.19-servicing.23316.11 - 6.0.19-servicing.23316.11 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23319.7 + 6.0.20-servicing.23319.7 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.314 + 6.0.315 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 4afc24ece692275bede7d7d2814b473f9535bcc9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 04:45:46 +0000 Subject: [PATCH 10/21] Merged PR 32134: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.20-servicing.23319.7 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.20-servicing.23319.7 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.20-servicing.23320.17 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23321.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230621.37 - **Date Produced**: June 22, 2023 12:58:13 AM UTC - **Commit**: 942c2e51b71ef5aaa289f5f2edd62db728e25201 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.9 to 6.0.315-servicing.23321.37][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.9 to 6.0.315-servicing.23321.37][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.20 to 6.0.20][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.20-servicin... --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 49bd305f7..3fa4c7668 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9035638c8..6d72dc294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2c767e33cbe4b0d6cffd10bbf72b2aa8fcaae995 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c34980ca5ff05b3673b08399dbe40e0d027d14bd + 39e0501ee91dcf2b9b885d647795184815fb0408 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e058a95e92f41e53e56790d1b2f7a4ba6e104034 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e08ea90cf3c415461f5bd983e9e6861b5b62e895 + 942c2e51b71ef5aaa289f5f2edd62db728e25201 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e08ea90cf3c415461f5bd983e9e6861b5b62e895 + 942c2e51b71ef5aaa289f5f2edd62db728e25201 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e38d20678..2cfe4db3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23321.4 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23321.8 @@ -46,18 +46,18 @@ 6.0.20 6.0.20 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 - 6.0.20-servicing.23320.17 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 0.2.0 - 6.0.315-servicing.23321.9 - 6.0.315-servicing.23321.9 + 6.0.315-servicing.23321.37 + 6.0.315-servicing.23321.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.20-servicing.23319.7 - 6.0.20-servicing.23319.7 + 6.0.20-servicing.23321.10 + 6.0.20-servicing.23321.10 6.0.20 6.0.20 From 3279c63fb784a576ac4ec5fc864f73033de67462 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 13:12:57 +0000 Subject: [PATCH 11/21] Merged PR 32137: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.19-servicing.23316.11 to 6.0.20-servicing.23321.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.19-servicing.23316.4 to 6.0.20-servicing.23321.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.119 to 6.0.120 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.119-servicing.23316.12 to 6.0.120-servicing.23321.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.119 to 6.0.120 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23321.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.19-servicing.233... --- NuGet.config | 20 ++++----- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 46 +++++++++---------- 3 files changed, 81 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7aad1ea7c..9ea65f80e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,21 @@ - + - - - + - + - + - + @@ -44,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c753e6f0c..e8eb5ed9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 964405678d47972b5a16730e00de42efaaecd351 + 198e1c4771fc6a8a19625159c5730c26ef00f3cf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fcf11495c6989362aa1012dc0d303ce619413624 + a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb66e68e5bfcf21879413b98962542bda9f66381 + 39e0501ee91dcf2b9b885d647795184815fb0408 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 29df36ca29205741afa9234e7d0ca702b05fd5aa + 0535557e46987fd9e55d88d90c6de59803dc1a7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 29df36ca29205741afa9234e7d0ca702b05fd5aa + 0535557e46987fd9e55d88d90c6de59803dc1a7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 29df36ca29205741afa9234e7d0ca702b05fd5aa + 0535557e46987fd9e55d88d90c6de59803dc1a7c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d + 03373847593368d3b5f5944386395879a0892f37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 86dfb8f630db1e0168b9d5b22104cbf6b81bfd3d + 03373847593368d3b5f5944386395879a0892f37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e9cc74519c57c5c4913459618f0dab2d6696ea1 + 7f67c1539dcfa02ef740306820b44a713bdcb525 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0 + 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 0e3ff3ea9054b5ab771db20d5a87923d97287bdb + 6c7f38c614304c93cd392907df7d5e770d5cf7f1 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index d3978c97a..de246d599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.19-servicing.23316.2 + 6.0.20-servicing.23321.4 - 6.0.19-servicing.23316.8 + 6.0.20-servicing.23321.8 - 6.0.119 + 6.0.120 @@ -44,20 +44,20 @@ - 6.0.19 - 6.0.19 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 - 6.0.19-servicing.23316.4 + 6.0.20 + 6.0.20 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 + 6.0.20-servicing.23321.6 0.2.0 - 6.0.120-servicing.23319.34 - 6.0.120-servicing.23319.34 + 6.0.120-servicing.23321.41 + 6.0.120-servicing.23321.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.19-servicing.23313.25 - 6.0.19-servicing.23313.25 - 6.0.19 - 6.0.19 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23320.17 + 6.0.20-servicing.23320.17 + 6.0.20 + 6.0.20 + 6.0.20 + 6.0.20 2.1.0 - 6.0.19-servicing.23316.11 - 6.0.19-servicing.23316.11 - 6.0.19 - 6.0.19 + 6.0.20-servicing.23321.10 + 6.0.20-servicing.23321.10 + 6.0.20 + 6.0.20 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.119 + 6.0.120 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.19 + 6.0.20 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 1f6a344f0530fc6e916795bc082e79dc12358902 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 16:48:54 +0000 Subject: [PATCH 12/21] Merged PR 32176: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.120 to 6.0.120 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.120-servicing.23321.3 to 6.0.120-servicing.23322.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.120 to 6.0.120 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230622.3 - **Date Produced**: June 22, 2023 4:10:36 PM UTC - **Commit**: 06a75e73b815059d525e88cd7dfebfab2091e361 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.120-servicing.23321.41 to 6.0.120-servicing.23322.3][1] - **Microsoft.NET.Sdk**: [from 6.0.120-servicing.23321.41 to 6.0.120-servicing.23322.3][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.120 to 6.0.120][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.120-servicing.23321.3 to 6.0.120-servicing.23322.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.120 to 6.0.120][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0337384759&targetVersion=GC06a75e73b8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC0535557e46&targetVersion=GC080b813fcf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9ea65f80e..f47da0a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8eb5ed9d..f52e9bd24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0535557e46987fd9e55d88d90c6de59803dc1a7c + 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0535557e46987fd9e55d88d90c6de59803dc1a7c + 080b813fcf9f2417d6f0d50a6853d1b71034482b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0535557e46987fd9e55d88d90c6de59803dc1a7c + 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 03373847593368d3b5f5944386395879a0892f37 + 06a75e73b815059d525e88cd7dfebfab2091e361 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 03373847593368d3b5f5944386395879a0892f37 + 06a75e73b815059d525e88cd7dfebfab2091e361 diff --git a/eng/Versions.props b/eng/Versions.props index de246d599..a003b40da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.120-servicing.23321.41 - 6.0.120-servicing.23321.41 + 6.0.120-servicing.23322.3 + 6.0.120-servicing.23322.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14e7d3c0b176d7936d4a3510b60e5ff4f5bc83f1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Jun 2023 18:34:47 +0000 Subject: [PATCH 13/21] Merged PR 32179: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.315 to 6.0.315 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.315 to 6.0.315 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230622.9 - **Date Produced**: June 22, 2023 5:52:42 PM UTC - **Commit**: 326d33693c0fc67483ad0da850d5f36ea5a078e8 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.315 to 6.0.315][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.315 to 6.0.315][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC942c2e51b7&targetVersion=GC326d33693c&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe058a95e92&targetVersion=GC3a75313bb4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3fa4c7668..3453596a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d72dc294..de3d76128 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e058a95e92f41e53e56790d1b2f7a4ba6e104034 + 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 942c2e51b71ef5aaa289f5f2edd62db728e25201 + 326d33693c0fc67483ad0da850d5f36ea5a078e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 942c2e51b71ef5aaa289f5f2edd62db728e25201 + 326d33693c0fc67483ad0da850d5f36ea5a078e8 diff --git a/eng/Versions.props b/eng/Versions.props index 2cfe4db3a..59c6bea8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.315-servicing.23321.37 - 6.0.315-servicing.23321.37 + 6.0.315-servicing.23322.9 + 6.0.315-servicing.23322.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 47aeefdcc04aa8bb03fb1166d0e6e05586cc3c9a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 22 Jun 2023 22:18:15 +0000 Subject: [PATCH 14/21] Merged PR 32193: Set OmniSharp run script to be executable Backport of https://github.com/dotnet/installer/pull/16772 but had to be modified due to lack of API support in 6.0. --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 56f14043b..747c739db 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -66,6 +66,7 @@ public class OmniSharpTests : SmokeTests Directory.CreateDirectory(OmniSharpDirectory); ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + ExecuteHelper.ExecuteProcessValidateExitCode("chmod", $"+x {OmniSharpDirectory}/run", OutputHelper); } } } From 1a7b8a9978494dd2047b9e9a225220a474b68741 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:23:46 +0000 Subject: [PATCH 15/21] Merged PR 32188: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20230622.14 - **Date Produced**: June 22, 2023 7:16:04 PM UTC - **Commit**: 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.120-servicing.23322.3 to 6.0.120-servicing.23322.14][1] - **Microsoft.NET.Sdk**: [from 6.0.120-servicing.23322.3 to 6.0.120-servicing.23322.14][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC06a75e73b8&targetVersion=GC1f82b9fbd6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- 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 f52e9bd24..9cfaae8dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 080b813fcf9f2417d6f0d50a6853d1b71034482b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06a75e73b815059d525e88cd7dfebfab2091e361 + 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 06a75e73b815059d525e88cd7dfebfab2091e361 + 1f82b9fbd6d2ed0076ed2ea733330ba98130a109 diff --git a/eng/Versions.props b/eng/Versions.props index a003b40da..f121d2ebc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.120-servicing.23322.3 - 6.0.120-servicing.23322.3 + 6.0.120-servicing.23322.14 + 6.0.120-servicing.23322.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2282fe998c54635c744653971f1903f98a33d49b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Jun 2023 00:23:50 +0000 Subject: [PATCH 16/21] Merged PR 32189: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20230622.16 - **Date Produced**: June 22, 2023 7:18:04 PM UTC - **Commit**: b9359aebf07bec085619421d7b078affadbd4b05 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1] - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23322.9 to 6.0.315-servicing.23322.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC326d33693c&targetVersion=GCb9359aebf0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9) --- 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 de3d76128..690e7b881 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 3a75313bb4f23e7fb72e1d382e944351dd4fa473 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326d33693c0fc67483ad0da850d5f36ea5a078e8 + b9359aebf07bec085619421d7b078affadbd4b05 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 326d33693c0fc67483ad0da850d5f36ea5a078e8 + b9359aebf07bec085619421d7b078affadbd4b05 diff --git a/eng/Versions.props b/eng/Versions.props index 59c6bea8b..b21111188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.315-servicing.23322.9 - 6.0.315-servicing.23322.9 + 6.0.315-servicing.23322.16 + 6.0.315-servicing.23322.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5bf1bb2bab977029943b1e8340fc43614df9756b Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 28 Jun 2023 10:29:15 -0700 Subject: [PATCH 17/21] Fix System.Text.Json poison instances (#16826) --- ...explicit-System.Text.Json-dependency.patch | 73 +++++++++++++++++++ ...explicit-System.Text.Json-dependency.patch | 31 ++++++++ 2 files changed, 104 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch create mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000..a9da3afe3 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 26 Jun 2023 23:46:46 +0000 +Subject: [PATCH] Add explicit System.Text.Json dependency + +Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up +from PSB, via Microsoft.Build package. + +Backport: https://github.com/dotnet/format/pull/1887 +--- + Directory.Packages.props | 1 + + eng/Version.Details.xml | 4 ++++ + eng/Versions.props | 2 ++ + src/dotnet-format.csproj | 6 ++++++ + 4 files changed, 13 insertions(+) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 6b628c22..c9f86593 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -36,5 +36,6 @@ + + + ++ + + +\ No newline at end of file +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index cdfa5f5e..86f02b44 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -13,6 +13,10 @@ + https://github.com/dotnet/command-line-api + 82273cb56c83b589e8e5b63da0ac9745ffc6e105 + ++ ++ https://github.com/dotnet/runtime ++ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 27582078..bccaf176 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -20,6 +20,8 @@ + + 2.0.0-beta1.21473.1 + 0.3.0-alpha.21473.1 ++ ++ 6.0.8 + + ++ + + + diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch new file mode 100644 index 000000000..74e217fbe --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nikola Milosavljevic +Date: Mon, 26 Jun 2023 23:02:20 +0000 +Subject: [PATCH] Add explicit System.Text.Json dependency + +Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up +from PSB, via Microsoft.Build package. + +Backport: https://github.com/dotnet/sdk/pull/33618 +--- + src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +index 065f750f72..13d2c1ed99 100644 +--- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj ++++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +@@ -23,6 +23,13 @@ + + + ++ ++ ++ ++ + + + From cd4682850c40c916f0bbaa1ef3616c73e80f7d20 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 5 Jul 2023 14:38:38 -0700 Subject: [PATCH 18/21] Update branding to 6.0.121 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fa3ce0164..97dbe85a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 20 + 21 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 03d62bc222eb4c896b235da1a4ff80e9b3ad14ac Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Jul 2023 08:39:16 -0500 Subject: [PATCH 19/21] Update SB SDK diff baseline for 6.0 (#16822) --- .../assets/baselines/MsftToSbSdk.diff | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 4e98d267b..1b86a0d2e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From bd99c96e72ad04331489c2a8f25d1633d5f57413 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 6 Jul 2023 08:40:35 -0500 Subject: [PATCH 20/21] Include RID in SB artifact file names (#16855) --- src/SourceBuild/tarball/content/build.proj | 4 ++-- .../tarball/content/repos/package-source-build.proj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 3cef840dc..523128954 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -134,7 +134,7 @@ - $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).$(TargetRid).tar.gz $(SmokeTestsArtifactsDir)prereq-packages/ @@ -190,7 +190,7 @@ - $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(BuildArchitecture).tar.gz + $(OutputPath)$(SourceBuiltPrebuiltsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz $(ResultingPrebuiltPackagesDir) diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj index 0101374dc..44c8e5cf5 100644 --- a/src/SourceBuild/tarball/content/repos/package-source-build.proj +++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj @@ -47,7 +47,7 @@ Directories="$(SourceBuildReferencePackagesDestination)extractArtifacts/" /> - $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz + $(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).$(TargetRid).tar.gz From 03de5438b760002d71d697e47609afefa3005d56 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 11 Jul 2023 14:01:05 -0500 Subject: [PATCH 21/21] .NET Source-Build 6.0.120 July 2023 Updates (#16942) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7a91aaab5..2de3d47ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.119 + 6.0.120 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index daa061377..0f6503072 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.119" + "dotnet": "6.0.120" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",