Skip to content

Commit d078461

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-9b4bfc2e-da25-4e5f-9778-eaded73d582b
2 parents 3fa7c57 + 7e54e22 commit d078461

File tree

6 files changed

+38
-30
lines changed

6 files changed

+38
-30
lines changed

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<!-- Begin: Package sources from dotnet-aspnetcore -->
1515
<!-- End: Package sources from dotnet-aspnetcore -->
1616
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
17-
<add key="darc-pub-DotNet-msbuild-Trusted-af11d4f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-af11d4f2-2/nuget/v3/index.json" />
17+
<add key="darc-pub-DotNet-msbuild-Trusted-74df0b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-74df0b3f/nuget/v3/index.json" />
1818
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1919
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2020
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2121
<!-- Begin: Package sources from dotnet-runtime -->
2222
<!-- End: Package sources from dotnet-runtime -->
2323
<!-- Begin: Package sources from dotnet-templating -->
24-
<add key="darc-pub-dotnet-templating-792298e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-792298e5/nuget/v3/index.json" />
24+
<add key="darc-pub-dotnet-templating-a767f5a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a767f5ab/nuget/v3/index.json" />
2525
<!-- End: Package sources from dotnet-templating -->
2626
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2727
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.118">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.119">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>792298e571e22f47422178c2b08e59554d3499a5</Sha>
6+
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.118-servicing.25316.3">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.119-servicing.25353.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>792298e571e22f47422178c2b08e59554d3499a5</Sha>
10+
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.118-servicing.25316.3">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.119-servicing.25353.1">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>792298e571e22f47422178c2b08e59554d3499a5</Sha>
14+
<Sha>a767f5ab3b1b19ed4ffca966caf040cff2da4c61</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.17">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.8.31">
58+
<Dependency Name="Microsoft.Build" Version="17.8.32">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
60+
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.8.31-servicing-25313-13">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.8.32-servicing-25352-05">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
64+
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.31-servicing-25313-13">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.32-servicing-25352-05">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>af11d4f253ee5c813bfd4f9d5902772638014572</Sha>
68+
<Sha>74df0b3f5a40864840fb8d7d597631ffcfd5215a</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25310.3</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25326.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -121,7 +121,7 @@
121121
</PropertyGroup>
122122
<PropertyGroup>
123123
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
124-
<MicrosoftBuildPackageVersion>17.8.31</MicrosoftBuildPackageVersion>
124+
<MicrosoftBuildPackageVersion>17.8.32</MicrosoftBuildPackageVersion>
125125
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
126126
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
127127
so target one that matches the version in minimumMSBuildVersion.
@@ -130,20 +130,20 @@
130130
<MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
131131
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
132132
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
133-
<MicrosoftBuildLocalizationPackageVersion>17.8.31-servicing-25313-13</MicrosoftBuildLocalizationPackageVersion>
133+
<MicrosoftBuildLocalizationPackageVersion>17.8.32-servicing-25352-05</MicrosoftBuildLocalizationPackageVersion>
134134
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
135135
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
136136
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/templating -->
140-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.118</MicrosoftTemplateEngineAbstractionsPackageVersion>
140+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.119</MicrosoftTemplateEngineAbstractionsPackageVersion>
141141
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
142142
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
143143
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
144144
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
145145
<!-- test dependencies -->
146-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.118-servicing.25316.3</MicrosoftTemplateEngineMocksPackageVersion>
146+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.119-servicing.25353.1</MicrosoftTemplateEngineMocksPackageVersion>
147147
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
148148
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
149149
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25310.3</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25326.1</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<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)