Skip to content

Commit 48dca38

Browse files
marcpopMSFTmarcpopMSFT
authored
[release/6.0.4xx] Update dependencies from dotnet/arcade (#41005)
2 parents 5f0dc4a + 24c1e02 commit 48dca38

File tree

8 files changed

+20
-40
lines changed

8 files changed

+20
-40
lines changed

‎NuGet.config

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,17 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-1d69605" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-aspnetcore-1d69605-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053-2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-aspnetcore-1d69605-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053-1/nuget/v3/index.json" />
107
<!-- End: Package sources from dotnet-aspnetcore -->
118
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
129
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
1310
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1411
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1512
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1613
<!-- Begin: Package sources from dotnet-runtime -->
17-
<add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-2/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-1/nuget/v3/index.json" />
2014
<!-- End: Package sources from dotnet-runtime -->
2115
<!-- Begin: Package sources from dotnet-templating -->
22-
<add key="darc-int-dotnet-templating-086db55" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-086db552/nuget/v3/index.json" />
2316
<!-- End: Package sources from dotnet-templating -->
2417
<!-- Begin: Package sources from dotnet-windowsdesktop -->
25-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-2/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-1/nuget/v3/index.json" />
2818
<!-- End: Package sources from dotnet-windowsdesktop -->
2919
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3020
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -44,22 +34,12 @@
4434
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4535
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4636
<!-- Begin: Package sources from dotnet-templating -->
47-
<add key="darc-int-dotnet-templating-086db55" value="true" />
4837
<!-- End: Package sources from dotnet-templating -->
4938
<!-- Begin: Package sources from dotnet-aspnetcore -->
50-
<add key="darc-int-dotnet-aspnetcore-1d69605-1" value="true" />
51-
<add key="darc-int-dotnet-aspnetcore-1d69605-2" value="true" />
52-
<add key="darc-int-dotnet-aspnetcore-1d69605" value="true" />
5339
<!-- End: Package sources from dotnet-aspnetcore -->
5440
<!-- Begin: Package sources from dotnet-runtime -->
55-
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
56-
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
57-
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
5841
<!-- End: Package sources from dotnet-runtime -->
5942
<!-- Begin: Package sources from dotnet-windowsdesktop -->
60-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="true" />
61-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="true" />
62-
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="true" />
6343
<!-- End: Package sources from dotnet-windowsdesktop -->
6444
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6545
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -295,22 +295,22 @@
295295
</Dependency>
296296
</ProductDependencies>
297297
<ToolsetDependencies>
298-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
298+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
299299
<Uri>https://github.com/dotnet/arcade</Uri>
300-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
300+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
301301
<SourceBuild RepoName="arcade" ManagedOnly="true" />
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
303+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
305+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
306306
</Dependency>
307-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24204.4">
307+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24266.4">
308308
<Uri>https://github.com/dotnet/arcade</Uri>
309-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
309+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
310310
</Dependency>
311-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
311+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24266.4">
312312
<Uri>https://github.com/dotnet/arcade</Uri>
313-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
313+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
314314
</Dependency>
315315
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
316316
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3131
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3232
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
33-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24204.4</MicrosoftDotNetSignToolVersion>
33+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24266.4</MicrosoftDotNetSignToolVersion>
3434
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3535
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3636
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
@@ -174,7 +174,7 @@
174174
<PropertyGroup>
175175
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
176176
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
177-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24204.4</MicrosoftDotNetXUnitExtensionsVersion>
177+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24266.4</MicrosoftDotNetXUnitExtensionsVersion>
178178
<MoqPackageVersion>4.8.2</MoqPackageVersion>
179179
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
180180
</PropertyGroup>

‎eng/common/templates-official/job/source-index-stage1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20210614.1
3+
sourceIndexPackageVersion: 1.0.1-20240320.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -32,10 +32,10 @@ jobs:
3232
- ${{ preStep }}
3333

3434
- task: UseDotNet@2
35-
displayName: Use .NET Core sdk 3.1
35+
displayName: Use .NET 8 SDK
3636
inputs:
3737
packageType: sdk
38-
version: 3.1.x
38+
version: 8.0.x
3939
installationPath: $(Agent.TempDirectory)/dotnet
4040
workingDirectory: $(Agent.TempDirectory)
4141

‎eng/common/templates-official/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexPackageVersion: 1.0.1-20210614.1
3+
sourceIndexPackageVersion: 1.0.1-20240320.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
66
preSteps: []
@@ -30,10 +30,10 @@ jobs:
3030
- ${{ preStep }}
3131

3232
- task: UseDotNet@2
33-
displayName: Use .NET Core sdk 3.1
33+
displayName: Use .NET 8 SDK
3434
inputs:
3535
packageType: sdk
36-
version: 3.1.x
36+
version: 8.0.x
3737
installationPath: $(Agent.TempDirectory)/dotnet
3838
workingDirectory: $(Agent.TempDirectory)
3939

‎eng/common/templates/jobs/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
1515
defaultManagedPlatform:
1616
name: 'Managed'
17-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
17+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7'
1818

1919
# Defines the platforms on which to run build jobs. One job is created for each platform, and the
2020
# object in this array is sent to the job template as 'platform'. If no platforms are specified,

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
15-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
14+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4",
15+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4"
1616
}
1717
}

0 commit comments

Comments
 (0)