Skip to content

Commit ada81b4

Browse files
LeafShi1LeafShi1
authored
Merge pull request #5219 from dotnet/darc-release/8.0-7a5a4e62-0cf5-45fc-8f27-a4e250407edb
[release/8.0] Update dependencies from dotnet/arcade
2 parents ab84abf + d382284 commit ada81b4

File tree

7 files changed

+38
-20
lines changed

7 files changed

+38
-20
lines changed

‎NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
1212
<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" />
13+
<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" />
14+
<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" />
1315
<!-- End: Package sources from dotnet-runtime -->
1416
<!-- Begin: Package sources from dotnet-winforms -->
1517
<add key="darc-int-dotnet-winforms-1957eae" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-winforms-1957eae-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-winforms-1957eae-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5-1/nuget/v3/index.json" />
1620
<!-- End: Package sources from dotnet-winforms -->
1721
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1822
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,9 +29,13 @@
2529
<clear />
2630
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2731
<!-- Begin: Package sources from dotnet-runtime -->
32+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
33+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
2834
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
2935
<!-- End: Package sources from dotnet-runtime -->
3036
<!-- Begin: Package sources from dotnet-winforms -->
37+
<add key="darc-int-dotnet-winforms-1957eae-1" value="true" />
38+
<add key="darc-int-dotnet-winforms-1957eae-2" value="true" />
3139
<add key="darc-int-dotnet-winforms-1957eae" value="true" />
3240
<!-- End: Package sources from dotnet-winforms -->
3341
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25310.3">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
156+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25310.3">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25407.1">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
160+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25310.3">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25407.1">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
164+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25310.3">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25407.1">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
168+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25310.3">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25407.1">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
172+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25310.3">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25407.1">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1</Sha>
176+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25310.3</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25310.3</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25407.1</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117"
3+
"dotnet": "8.0.119"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25310.3",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25407.1",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)