Skip to content

Commit 5370876

Browse files
cincuranetcincuranet
authored
Merge pull request #36540 from dotnet/release/8.0
[release/8.0-staging] Merge release/8.0 to release/8.0-staging
2 parents 08cefb3 + a6dd6d6 commit 5370876

File tree

7 files changed

+44
-30
lines changed

7 files changed

+44
-30
lines changed

‎NuGet.config‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
810
<!-- End: Package sources from dotnet-runtime -->
911
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1012
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +21,9 @@
1921
<clear />
2022
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2123
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
24+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
25+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
26+
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
2327
<!-- End: Package sources from dotnet-runtime -->
2428
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2529
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.16-servicing.25215.6">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.19-servicing.25365.14">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
34+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -41,36 +41,36 @@
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4242
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Text.Json" Version="8.0.5">
44+
<Dependency Name="System.Text.Json" Version="8.0.6">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
46+
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
50+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.16">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.19">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
54+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
5555
</Dependency>
5656
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
57-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.16-servicing.25215.6">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.19-servicing.25365.14">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
59-
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
59+
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25263.4">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
6464
<Uri>https://github.com/dotnet/arcade</Uri>
65-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
65+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25263.4">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25407.1">
6868
<Uri>https://github.com/dotnet/arcade</Uri>
69-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
69+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25263.4">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25407.1">
7272
<Uri>https://github.com/dotnet/arcade</Uri>
73-
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
73+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
7474
</Dependency>
7575
</ToolsetDependencies>
7676
</Dependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>8.0.18</VersionPrefix>
3+
<VersionPrefix>8.0.20</VersionPrefix>
44
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -24,16 +24,16 @@
2424
<MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
2525
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
2626
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.16-servicing.25215.6</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.19-servicing.25365.14</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
29-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
29+
<SystemTextJsonVersion>8.0.6</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.2</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.16</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.16-servicing.25215.6</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.19</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.19-servicing.25365.14</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25263.4</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ parameters:
2121
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222
artifacts: ''
2323
enableMicrobuild: false
24+
microbuildUseESRP: true
2425
enablePublishBuildArtifacts: false
2526
enablePublishBuildAssets: false
2627
enablePublishTestResults: false
@@ -135,6 +136,11 @@ jobs:
135136
signType: $(_SignType)
136137
zipSources: false
137138
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
139+
${{ if eq(parameters.microbuildUseESRP, true) }}:
140+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
141+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+
${{ else }}:
143+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
138144
env:
139145
TeamName: $(_TeamName)
140146
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 }}

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
417417

418418
# Locate Visual Studio installation or download x-copy msbuild.
419419
$vsInfo = LocateVisualStudio $vsRequirements
420-
if ($vsInfo -ne $null) {
420+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
421421
# Ensure vsInstallDir has a trailing slash
422422
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
423423
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "8.0.116",
3+
"version": "8.0.119",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "8.0.116",
8+
"dotnet": "8.0.119",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4",
17-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4"
16+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
17+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
1818
}
1919
}

0 commit comments

Comments
 (0)