Skip to content

Commit b0f69b7

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into darc-release/8.0.4xx-26b810a0-7350-46b8-a84e-a44d0730ebe8
2 parents faa2a1b + 5cbc59a commit b0f69b7

File tree

6 files changed

+37
-24
lines changed

6 files changed

+37
-24
lines changed

‎NuGet.config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,19 @@
1717
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61/nuget/v3/index.json" />
1818
<!-- End: Package sources from dotnet-aspnetcore -->
1919
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
20+
<add key="darc-pub-DotNet-msbuild-Trusted-901dc04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-901dc04e/nuget/v3/index.json" />
2021
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2122
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2223
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2324
<!-- Begin: Package sources from dotnet-runtime -->
2425
<add key="darc-int-dotnet-runtime-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
2526
<!-- End: Package sources from dotnet-runtime -->
2627
<!-- Begin: Package sources from dotnet-templating -->
27-
<add key="darc-pub-dotnet-templating-caa21b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-caa21b11/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-62bbe0a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac/nuget/v3/index.json" />
29+
<add key="darc-pub-dotnet-templating-62bbe0a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac-4/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-62bbe0a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac-3/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-templating-62bbe0a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac-2/nuget/v3/index.json" />
32+
<add key="darc-pub-dotnet-templating-62bbe0a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-62bbe0ac-1/nuget/v3/index.json" />
2833
<!-- End: Package sources from dotnet-templating -->
2934
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3035
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a3ad74/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.31">
59-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
60-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
58+
<Dependency Name="Microsoft.Build" Version="17.11.38">
59+
<Uri>https://github.com/dotnet/msbuild</Uri>
60+
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.31-servicing-25210-17">
63-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
64-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.38-servicing-25354-03">
63+
<Uri>https://github.com/dotnet/msbuild</Uri>
64+
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.31-servicing-25210-17">
67-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
68-
<Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.38-servicing-25354-03">
67+
<Uri>https://github.com/dotnet/msbuild</Uri>
68+
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25326.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
496+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25310.3">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25326.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
501+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25310.3">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25326.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
505+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25310.3">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25326.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
509+
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25310.3</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25326.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.11.38</MicrosoftBuildPackageVersion>
130130
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
131131
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
132132
so target one that matches the version in minimumMSBuildVersion.
@@ -135,7 +135,7 @@
135135
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.11.31-servicing-25210-17</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.11.38-servicing-25354-03</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25326.1</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/templates-official/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ jobs:
135135
signType: $(_SignType)
136136
zipSources: false
137137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
139+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
140+
${{ else }}:
141+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138142
env:
139143
TeamName: $(_TeamName)
140144
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
continueOnError: ${{ parameters.continueOnError }}

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1"
1919
}
2020
}

0 commit comments

Comments
 (0)