From 83d785ccfb755e51b3dfb9b388ea46dc47020a12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:35:31 -0800 Subject: [PATCH 01/22] [release/7.0.2xx] Update dependencies from dotnet/arcade (#15332) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- eng/Version.Details.xml | 96 +++++++++--------- eng/Versions.props | 44 ++++---- eng/common/generate-locproject.ps1 | 48 ++++++++- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 0 -> 3810 bytes eng/common/templates/job/execute-sdl.yml | 3 +- eng/common/templates/job/onelocbuild.yml | 43 ++++---- .../templates/job/publish-build-assets.yml | 14 ++- eng/common/templates/job/source-build.yml | 7 +- .../templates/job/source-index-stage1.yml | 5 +- eng/common/templates/jobs/jobs.yml | 9 -- .../templates/post-build/post-build.yml | 12 ++- .../templates/variables/pool-providers.yml | 57 +++++++++++ global.json | 4 +- 13 files changed, 226 insertions(+), 116 deletions(-) create mode 100644 eng/common/loc/P22DotNetHtmlLocalization.lss create mode 100644 eng/common/templates/variables/pool-providers.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4901444ee..9d76a5c04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f51697b054c6691ed59209ef8524013d44bb449c + 417429fc040af552532bb07aad29e5e8639b840f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d037e070ebe5c83838443f869d5800752b0fcb13 + d099f075e45d2aa6007a22b71b45a08758559f80 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 7c810658463f35c39c54d5fb8a8dbbfd463bf747 + bb01bbf4433e27289b99001b7de6a582879d1835 https://github.com/dotnet/test-templates @@ -116,13 +116,13 @@ 9acbc4db3fa18e9839189580622be7258f81c9d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b06c27c9b81f33e69f8d5155fe69693f661fa3d + e83409daa530605da4eb5f847c6740a520325d25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - df04c57b2e2bb986f0afc2384cbebb3c950447b5 + 636e2b7a00a434a354a126f510a56e16ce3c6bbc https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 - + https://github.com/dotnet/emsdk - d71ea7cbed84152a921c7b7b4b4439c306bf9130 + 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 https://github.com/dotnet/deployment-tools @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2e5be79b4..a1d3aaff8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,15 +27,15 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23108.1 - 7.0.2-servicing.22606.8 + 7.0.0-rtm.22518.7 - 7.0.2-servicing.22606.2 + 7.0.0-rtm.22518.2 @@ -50,13 +50,13 @@ - 7.0.2 - 7.0.2 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 - 7.0.2-servicing.22606.6 + 7.0.0 + 7.0.0 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 + 7.0.0-rtm.22518.19 0.2.0 @@ -76,20 +76,20 @@ - 7.0.2-servicing.22606.5 - 7.0.2-servicing.22606.5 - 7.0.2 - 7.0.2 - 7.0.2 - 7.0.2 + 7.0.0-rtm.22518.5 + 7.0.0-rtm.22518.5 + 7.0.0 + 7.0.0 + 7.0.0 + 7.0.0 2.1.0 - 7.0.2-servicing.22607.1 - 7.0.2-servicing.22607.1 - 7.0.2 - 7.0.2 + 7.0.0-rtm.22519.1 + 7.0.0-rtm.22519.1 + 7.0.0 + 7.0.0 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.2 - 7.0.2 + 7.0.0 + 7.0.0 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bab18543d..bcb579e37 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -34,6 +34,25 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them +if (-not $wxlFiles) { + $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files + if ($wxlEnFiles) { + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } + } +} + +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlFiles = @() +if ($macosHtmlEnFiles) { + $macosHtmlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $macosHtmlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru + } +} $xlfFiles = @() @@ -91,6 +110,7 @@ $locJson = @{ ) }, @{ + LanguageSet = $LanguageSet CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( @@ -98,8 +118,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($_.FullName.Contains($exclusion)) - { + if ($_.FullName.Contains($exclusion)) { $continue = $false } } @@ -110,7 +129,30 @@ $locJson = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath - Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW" + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) + LocItems = @( + $macosHtmlFiles | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath } } } diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 0000000000000000000000000000000000000000..6661fed566e49b0c206665bc21f135e06c9b89c4 GIT binary patch literal 3810 zcmd^CT~8BH5S?ce|HG9Bo&v?0;P_m6l= znU-wb=}VLT7UH{>{5H;0M4iLmRE8QeBRr|>&k=uV*L;heKY+dq>B$0^=0I}|x`)s{ zht4t9zaiEh5Fe>E-;zVT;c4G?v;9N0G=rWwo~*(Cs`OS6ZL`HL;vsL0J@I%$+0YvE zx{9ukK|FtFx1PlPD5M;6ZM>f;1BhCf?`8y6QH*?RT9T>XwF z#~m_N+i^UKE^j{e;KdNW`kH9Rbj{G8tDY}mafCgG+m3H`I@_PhrDmcIzxD&IX@s083kV|lLUE^0(h6wWRPN0QN1n^PU5eX8r6OZ*s^g)tt77#SZCB}znxye#U$Dtinr6lnVu z!LzA{A}0~no7p$thFGJAnI}oSW||9H=Bz}I7kD#2MLg7WfrlE5o9sQjePc>qmv+6iQCmdp(y}(Vr literal 0 HcmV?d00001 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index aaeb83b4d..7c164ac02 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -46,6 +46,7 @@ jobs: - template: /eng/common/templates/variables/sdl-variables.yml - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + - template: /eng/common/templates/variables/pool-providers.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -53,7 +54,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6b8fc9970..60ab00c4d 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -14,6 +14,7 @@ parameters: ReusePr: true UseLfLineEndings: true UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false LanguageSet: VS_Main_Languages LclSource: lclFilesInRepo LclPackageId: '' @@ -22,13 +23,25 @@ parameters: MirrorRepo: '' MirrorBranch: main condition: '' + JobNameSuffix: '' jobs: -- job: OneLocBuild +- job: OneLocBuild${{ parameters.JobNameSuffix }} dependsOn: ${{ parameters.dependsOn }} - displayName: OneLocBuild + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -40,27 +53,17 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - steps: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} - task: OneLocBuild@2 displayName: OneLocBuild diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1cbb6a0c5..c5fedd7f7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,15 +34,15 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets ${{ else }}: displayName: Publish to Build Asset Registry - pool: ${{ parameters.pool }} - variables: + - template: /eng/common/templates/variables/pool-providers.yml - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats @@ -51,6 +51,16 @@ jobs: - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates/post-build/common-variables.yml + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: VSEngSS-MicroBuild2022-1ES + demands: Cmd + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44a..8a3deef2b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -44,13 +44,16 @@ jobs: ${{ if eq(parameters.platform.pool, '') }}: # The default VM host AzDO pool. This should be capable of running Docker containers: almost all # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 59a42c338..09c506d11 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -22,16 +22,17 @@ jobs: value: ${{ parameters.binlogPath }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: source-dot-net stage1 variables + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 297e7946b..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -88,15 +88,6 @@ jobs: - ${{ job.job }} - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 957375c1c..c051f1b65 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -95,6 +95,7 @@ stages: displayName: Validate Build Assets variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: NuGet Validation @@ -106,7 +107,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +144,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +204,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -251,6 +252,7 @@ stages: displayName: Publish using Darc variables: - template: common-variables.yml + - template: /eng/common/templates/variables/pool-providers.yml jobs: - job: displayName: Publish Using Darc @@ -262,7 +264,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Svc-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -282,4 +284,4 @@ stages: -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml new file mode 100644 index 000000000..99c80212b --- /dev/null +++ b/eng/common/templates/variables/pool-providers.yml @@ -0,0 +1,57 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage these can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) and $ (DncEngPublicBuildPool), e.g.: +# +# pool: +# name: $(DncEngInternalBuildPool) +# demands: ImageOverride -equals windows.vs2019.amd64 + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/global.json b/global.json index c4142c606..40e2f263c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" } } From e2c796b8c1c07902c474daf30964ba360dcb705d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 9 Feb 2023 16:08:19 -0800 Subject: [PATCH 02/22] [release/7.0.2xx] Update checksum generation order (#15397) (#15482) Co-authored-by: Michael Simons --- eng/AfterSigning.targets | 24 ++++++++++++++++++++++++ src/redist/redist.csproj | 1 - 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 eng/AfterSigning.targets diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets new file mode 100644 index 000000000..b8a08378a --- /dev/null +++ b/eng/AfterSigning.targets @@ -0,0 +1,24 @@ + + + <_SuppressSdkImports>false + + + + + + + + + + + + + %(FullPath).sha512 + + + + + + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index d9b868ecc..554b1b1ee 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -47,5 +47,4 @@ - From 11315562cf13f1cf19837e61cd5da050cb0c2b6a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 11 Feb 2023 00:57:40 +0100 Subject: [PATCH 03/22] [automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15472) Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: Matt Mitchell Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe Co-authored-by: Jason Zhai Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: @@ -7,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ @@ -99,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + From 3cc0821abb05a202fe6d59ec9aba5ab9e1d43be9 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:55:20 -0800 Subject: [PATCH 04/22] Merging internal commits for release/7.0.2xx (#15537) Co-authored-by: DotNet Bot Co-authored-by: Matt Mitchell --- NuGet.config | 15 +++ eng/Version.Details.xml | 120 +++++++++--------- eng/Versions.props | 48 +++---- ...solvePackageFileConflicts-workaround.patch | 23 ---- 4 files changed, 99 insertions(+), 107 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..115e019e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,23 @@ + + + + + + + + + @@ -36,11 +45,17 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d76a5c04..f142d42a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,39 +98,39 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - - https://github.com/dotnet/sdk - 9acbc4db3fa18e9839189580622be7258f81c9d5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + fc6a47e3e33b91bd2690161465db7a6c4149d480 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + e391694876e891d2cdc4089e62fe7b1138d8294e @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a1d3aaff8..e602baaa4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 - 7.0.200-preview.23063.9 - 7.0.200-preview.23063.9 - 7.0.200-preview.23063.9 + 7.0.200 + 7.0.200-rtm.23080.7 + 7.0.200-rtm.23080.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -206,8 +206,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch deleted file mode 100644 index ab355630e..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 11 Nov 2022 21:10:54 +0000 -Subject: [PATCH] ResolvePackageFileConflicts workaround - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 3b5d2ae950..f92fb421fe 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - -+ -+ -+ - - - From db2e7bac4f6fc44212bc792714974209d28db39f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Feb 2023 16:35:54 -0800 Subject: [PATCH 05/22] Change how VS setup authoring is configured. --- src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 03e407b2e..7ce25b785 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build foreach (var file in files) { - sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); + sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.AppendLine("\""); } From bbcbae4320bf7379fd70d6709dd5c1b88dbf860f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:36:39 -0800 Subject: [PATCH 06/22] [release/7.0.2xx] Bump ASP.NET template versions (#15547) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e602baaa4..c7cab947c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.13 + 6.0.14 $(MicrosoftWinFormsProjectTemplates50PackageVersion) $(MicrosoftWPFProjectTemplates50PackageVersion) @@ -159,7 +159,7 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) $(MicrosoftDotNetTestProjectTemplates30PackageVersion) - 3.0.1 + 3.0.3 1.5.3 1.0.2-beta3 From ab3f98be97814cd294cfc161840d5838d8dd4e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Feb 2023 04:59:40 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/arcade build 20230214.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23108.1 -> To Version 7.0.0-beta.23114.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index facb64304..9bc540e9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 - + https://github.com/dotnet/arcade - 5eac3ace1b09862bd7421ba55795cc2a9c6a57d5 + 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 03c93d912..ea898f695 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23108.1 + 7.0.0-beta.23114.3 diff --git a/global.json b/global.json index 40e2f263c..5039463a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.102", + "dotnet": "7.0.103", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3" } } From e52c7c37de9399d9f6333e4be08671ac11981f53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 02:46:31 +0000 Subject: [PATCH 08/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15555) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22519.1 to 7.0.3-servicing.23073.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 7.0.0-rtm.22518.19 to 7.0.3-servicing.23080.9 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22518.7 to 7.0.3-servicing.23072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0 to 7.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22518.2 to 7.0.3-servicing.23073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23113.3 to 12.5.0-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23113.3 to 7.0.300-beta.23114.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230213-04 to 17.6.0-preview-20230214-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.23110.2 to 7.0.100-1.23115.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.6.0-preview-23114-04 to 17.6.0-preview-23115-01 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.6.0-preview.2.21 to 6.6.0-preview.2.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22518.5 to 7.0.3-servicing.23069.10 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.0 to 7.0.3 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0) - Merge branch 'release/7.0.3xx' of https://github.com/dotnet/installer into darc-release/7.0.3xx-f01d7d5b-1d0f-4013-a849-a2d0a661b15b --- NuGet.config | 20 +++++++ eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 50 ++++++++-------- 3 files changed, 107 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d6b197f7..0f14f7ff0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,24 @@ + + + + + + + + + + @@ -36,11 +46,21 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9bc540e9b..e5ad729f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 417429fc040af552532bb07aad29e5e8639b840f + 0e6192540357f08063fb1127f1a791fb6a3e194c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a2bda10e81d901396c3cff95533529e3a93ad47 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - bb01bbf4433e27289b99001b7de6a582879d1835 + febee99db845fd8766a13bdb391a07c3ee90b4ba https://github.com/dotnet/test-templates @@ -98,49 +98,49 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://github.com/dotnet/sdk - 758db962ccbfa4526798159135034b30209dc454 + 20f38277e93844dd7cbbb4dcc6121050f2557712 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e83409daa530605da4eb5f847c6740a520325d25 + cce692f665cbefe335ed33369897cea328d5fbcf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 636e2b7a00a434a354a126f510a56e16ce3c6bbc + 0a09c7d17212981cb4fd5907fa6a6214966a366d - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/dotnet/fsharp - 3263ac15552940d944b4bff27547022ade3da16a + 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4bb2af558ce5bea6b8822135fa88fa6ae035b408 + 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b - + https://github.com/dotnet/linker - 19b53fbd053afc02fc20456d07d83fb8a94649c8 + 757da5c5adf9a6a9732285ccace1abf136be1370 linker @@ -149,27 +149,27 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - 03de075bf00cadc8cf6e884f1719ea1d2da5b30e + dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 - + https://github.com/nuget/nuget.client - b84ca7373557c5725836697f81786ed22e20ead5 + 55728432057dc57733661fe01e9c8493ab5034f2 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb - + https://github.com/dotnet/emsdk - 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31 + 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ea898f695..943874c00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22518.7 + 7.0.3-servicing.23072.1 - 7.0.0-rtm.22518.2 + 7.0.3-servicing.23073.1 @@ -50,22 +50,22 @@ - 7.0.0 - 7.0.0 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 - 7.0.0-rtm.22518.19 + 7.0.3 + 7.0.3 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 + 7.0.3-servicing.23080.9 0.2.0 - 7.0.300-preview.23114.15 - 7.0.300-preview.23114.15 - 7.0.300-preview.23114.15 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 + 7.0.300-preview.23115.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,20 +76,20 @@ - 7.0.0-rtm.22518.5 - 7.0.0-rtm.22518.5 - 7.0.0 - 7.0.0 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23069.10 + 7.0.3-servicing.23069.10 + 7.0.3 + 7.0.3 + 7.0.3 + 7.0.3 2.1.0 - 7.0.0-rtm.22519.1 - 7.0.0-rtm.22519.1 - 7.0.0 - 7.0.0 + 7.0.3-servicing.23073.3 + 7.0.3-servicing.23073.3 + 7.0.3 + 7.0.3 @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230213-04 + 17.6.0-preview-20230214-01 @@ -205,8 +205,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0 - 7.0.0 + 7.0.3 + 7.0.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 492415028e8d9079f5509ad7d07a9d8ba7b30ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:34:16 +0000 Subject: [PATCH 09/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15568) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230214-01 to 17.6.0-preview-20230215-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5ad729f7..348a0300f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee - + https://github.com/dotnet/sdk - 20f38277e93844dd7cbbb4dcc6121050f2557712 + 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 4cf1986ee6f2c7ec42efdbbda84d16a0435f741b + 9da4e7f7505af42b34e1a2d7ba6857f98782025f diff --git a/eng/Versions.props b/eng/Versions.props index 943874c00..a53949324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 - 7.0.300-preview.23115.25 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 + 7.0.300-preview.23116.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230214-01 + 17.6.0-preview-20230215-02 From c37b41100483f1e5cd219fc29ad730fe970e108d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 18:37:22 +0000 Subject: [PATCH 10/22] [release/7.0.3xx] Update dependencies from dotnet/test-templates (#15566) [release/7.0.3xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 348a0300f..0c1b665f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/test-templates - bb3695688177f5f80eeb3c0498168612e31549d5 + 94c498e399eb1cbb7290ed1e42564589a259312a diff --git a/eng/Versions.props b/eng/Versions.props index a53949324..eac08ee40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,9 +40,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 - 1.1.0-rc.22558.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 + 1.1.0-rc.23115.1 From 6bd39417c02dd4cfa3b12e2d92c20be32f7c9faa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Feb 2023 23:45:26 +0000 Subject: [PATCH 11/22] Update dependencies from https://github.com/dotnet/sdk build 20230216.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.3 -> To Version 7.0.300-preview.23116.20 --- NuGet.config | 6 ------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f14f7ff0..cca4643c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -46,9 +43,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c1b665f4..98cda2204 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 - + https://github.com/dotnet/sdk - 29f1a434bb7d3b2e5bde9b20b1c9a6f4a9d051ee + 3e548f194d9ce13407da2b76a919d8342bd844a6 diff --git a/eng/Versions.props b/eng/Versions.props index eac08ee40..886e7eff5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 - 7.0.300-preview.23116.3 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 + 7.0.300-preview.23116.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2bbeab10e482b7c30979c9dcbefd73f65c07aeae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Feb 2023 20:29:29 +0000 Subject: [PATCH 12/22] Update dependencies from https://github.com/dotnet/sdk build 20230217.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23116.20 -> To Version 7.0.300-preview.23117.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230215-02 -> To Version 17.6.0-preview-20230216-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index cca4643c7..60f566b46 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,8 +11,6 @@ - - @@ -45,8 +43,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98cda2204..f9d0dc7b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 - + https://github.com/dotnet/sdk - 3e548f194d9ce13407da2b76a919d8342bd844a6 + a39a29e6c79966e684f548d040c23b3fad42b3f7 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 9da4e7f7505af42b34e1a2d7ba6857f98782025f + ffe76699011531871532725b317bfcac1d45ef5f @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - dfd8f413a80cd0865f968b2c0ad9b09c0df8c430 + c5cceaabe1b83f8aaea2f29792157b6307b29686 diff --git a/eng/Versions.props b/eng/Versions.props index 886e7eff5..f2e8d3ce3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 - 7.0.300-preview.23116.20 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 + 7.0.300-preview.23117.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230215-02 + 17.6.0-preview-20230216-01 From 72e301ec9952acd14e048b75b7d4b0e4c78c4c42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Feb 2023 00:45:16 +0000 Subject: [PATCH 13/22] Update dependencies from https://github.com/dotnet/sdk build 20230217.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23117.32 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9d0dc7b2..79757fa14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 - + https://github.com/dotnet/sdk - a39a29e6c79966e684f548d040c23b3fad42b3f7 + 8a9199debb102c782d14e04afe10ede56f158c35 diff --git a/eng/Versions.props b/eng/Versions.props index f2e8d3ce3..a60850d22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 - 7.0.300-preview.23117.12 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 + 7.0.300-preview.23117.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 83bd64eaad2cfb4066103d471e9aa55647112390 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 07:33:24 +0000 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/sdk build 20230219.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23117.12 -> To Version 7.0.300-preview.23119.5 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230216-01 -> To Version 17.6.0-preview-20230217-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ---------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60f566b46..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,11 +15,6 @@ - - - - - @@ -46,11 +41,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79757fa14..0871bf28a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 - + https://github.com/dotnet/sdk - 8a9199debb102c782d14e04afe10ede56f158c35 + c7add0029f4ce60808753b9c0c053a92165b19f1 @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - ffe76699011531871532725b317bfcac1d45ef5f + 27964da9af0a67fd25bb75488a6582eecbf8fe03 diff --git a/eng/Versions.props b/eng/Versions.props index a60850d22..d9f11e43b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 - 7.0.300-preview.23117.32 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 + 7.0.300-preview.23119.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230216-01 + 17.6.0-preview-20230217-01 From 8a7ef9f5d4995d275ce9123931f9697dcaaeeb4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 11:23:57 +0000 Subject: [PATCH 15/22] Update dependencies from https://github.com/dotnet/sdk build 20230220.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.4 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23117-04 -> To Version 17.6.0-preview-23120-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0871bf28a..9663cae81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 - + https://github.com/dotnet/sdk - c7add0029f4ce60808753b9c0c053a92165b19f1 + ae1dd97107fef7d4b5a78e7df96e954b397d4950 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - c5cceaabe1b83f8aaea2f29792157b6307b29686 + bd756efe2f9ddec21afb01807a450a0a83cfd985 diff --git a/eng/Versions.props b/eng/Versions.props index d9f11e43b..12efb93f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 - 7.0.300-preview.23119.5 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 + 7.0.300-preview.23120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bee3089f2ab1d306bd96defb3ac97651c7b44a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 03:56:32 +0000 Subject: [PATCH 16/22] Update dependencies from https://github.com/dotnet/sdk build 20230220.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23119.5 -> To Version 7.0.300-preview.23120.13 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.6.0-preview-20230217-01 -> To Version 17.6.0-preview-20230220-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9663cae81..e353d637c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d - + https://github.com/dotnet/sdk - ae1dd97107fef7d4b5a78e7df96e954b397d4950 + 4e0f5acf23d044d7f66f98bcc24312f818c96f5d @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 27964da9af0a67fd25bb75488a6582eecbf8fe03 + 537a174d393a0c8770aa472d5eb8a3c45271ce1b diff --git a/eng/Versions.props b/eng/Versions.props index 12efb93f2..40d3a82eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 - 7.0.300-preview.23120.4 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 + 7.0.300-preview.23120.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230217-01 + 17.6.0-preview-20230220-01 From cebe98b5b60dec4ab85134514404e900ecbf6dcd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 07:47:09 +0000 Subject: [PATCH 17/22] Update dependencies from https://github.com/dotnet/sdk build 20230220.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.13 -> To Version 7.0.300-preview.23120.16 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23120-01 -> To Version 17.6.0-preview-23121-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e353d637c..a3c493549 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 - + https://github.com/dotnet/sdk - 4e0f5acf23d044d7f66f98bcc24312f818c96f5d + f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 @@ -149,9 +149,9 @@ 73338d92270b9f26982eca2e8872037a0214b912 - + https://github.com/dotnet/msbuild - bd756efe2f9ddec21afb01807a450a0a83cfd985 + 02c4162874fb061081978f49295c3c3cee25978a diff --git a/eng/Versions.props b/eng/Versions.props index 40d3a82eb..2f9d73bc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 - 7.0.300-preview.23120.13 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 + 7.0.300-preview.23120.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5d9462454d200e2b71b0813b9036c0a2ac0fab68 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 21 Feb 2023 00:37:18 -0800 Subject: [PATCH 18/22] Update implicit version for March release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5ecb3a19f..3bdff216f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 13 + 14 From c884d8c54ea1b6d025b5919871c5c524468aece0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 17:00:45 +0000 Subject: [PATCH 19/22] Update dependencies from https://github.com/dotnet/sdk build 20230221.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.4 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3c493549..1c471c337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb - + https://github.com/dotnet/sdk - f3cd1ebc2ef7e585f0e06ad7f305f1ebf11f8e90 + 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb @@ -133,9 +133,9 @@ 75647e8f098a1a2b50d4d755394598ae6f38b164 - + https://github.com/microsoft/vstest - 537a174d393a0c8770aa472d5eb8a3c45271ce1b + 3990c633bcf933291f40d44c0b7586c3a6e89d55 diff --git a/eng/Versions.props b/eng/Versions.props index 2f9d73bc6..d94d82c30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 - 7.0.300-preview.23120.16 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 + 7.0.300-preview.23121.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230220-01 + 17.6.0-preview-20230221-02 From 59eed2b64e59b5064e08dc15cd80b9c551fca499 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Feb 2023 19:27:41 +0000 Subject: [PATCH 20/22] Update dependencies from https://github.com/dotnet/sdk build 20230221.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23120.16 -> To Version 7.0.300-preview.23121.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230220-01 -> To Version 17.6.0-preview-20230221-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c471c337..ed6ae0fc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 - + https://github.com/dotnet/sdk - 6d8f152b37921c5b462c46e38adcf73d0dd2e5fb + 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 diff --git a/eng/Versions.props b/eng/Versions.props index d94d82c30..25e36ad7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 - 7.0.300-preview.23121.4 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 + 7.0.300-preview.23121.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 41c01dc860b00c4f4e3ac96ded63e95263c71abe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 03:28:00 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/sdk build 20230221.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.7 -> To Version 7.0.300-preview.23121.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 7.0.100-1.23115.1 -> To Version 7.0.100-1.23121.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed6ae0fc5..f419e88d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b - + https://github.com/dotnet/sdk - 4698ec725c4f2b9c4ef522e7793bd1b75be1d776 + 1e267a014a1b18c6273a86c68299b425cf47596b @@ -138,15 +138,15 @@ 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/linker - 757da5c5adf9a6a9732285ccace1abf136be1370 + b516999ab57ce68da016b68cc2a09e2c15208e68 linker - + https://github.com/dotnet/roslyn - 73338d92270b9f26982eca2e8872037a0214b912 + e728efff2fe94c2614dd53ae4bd428cb4187753e diff --git a/eng/Versions.props b/eng/Versions.props index 25e36ad7c..54f6dc00f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 - 7.0.300-preview.23121.7 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 + 7.0.300-preview.23121.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d56895f92fb4c63b2371ad75180faf4c717e1c07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 07:09:36 +0000 Subject: [PATCH 22/22] Update dependencies from https://github.com/dotnet/sdk build 20230221.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23121.10 -> To Version 7.0.300-preview.23121.14 Dependency coherency updates Microsoft.Build From Version 17.6.0-preview-23121-03 -> To Version 17.6.0-preview-23122-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f419e88d4..143aad28f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 94c498e399eb1cbb7290ed1e42564589a259312a - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba - + https://github.com/dotnet/sdk - 1e267a014a1b18c6273a86c68299b425cf47596b + 106807e7fe11f4f7f5fee31bc3fe0218248d16ba @@ -149,9 +149,9 @@ e728efff2fe94c2614dd53ae4bd428cb4187753e - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e diff --git a/eng/Versions.props b/eng/Versions.props index 54f6dc00f..ce2acadc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 - 7.0.300-preview.23121.10 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 + 7.0.300-preview.23121.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)