Skip to content

Commit b5f7248

Browse files
mmitchemmitche
committed
Update to arcade with WiX fix (225814)
1 parent 4a23416 commit b5f7248

File tree

8 files changed

+33
-27
lines changed

8 files changed

+33
-27
lines changed

‎NuGet.config‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
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-runtime -->
129
<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" />
10+
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-4/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-3/nuget/v3/index.json" />
1312
<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" />
1413
<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" />
1514
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
@@ -20,9 +19,13 @@
2019
<!-- End: Package sources from dotnet-runtime -->
2120
<!-- Begin: Package sources from dotnet-templating -->
2221
<add key="darc-int-dotnet-templating-f9d1cd9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f9d1cd96/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-templating-f9d1cd9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f9d1cd96-2/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-templating-f9d1cd9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-f9d1cd96-1/nuget/v3/index.json" />
2324
<!-- End: Package sources from dotnet-templating -->
2425
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2526
<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" />
27+
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-4/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-3/nuget/v3/index.json" />
2629
<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" />
2730
<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" />
2831
<!-- End: Package sources from dotnet-windowsdesktop -->
@@ -41,23 +44,26 @@
4144
<disabledPackageSources>
4245
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4346
<!-- Begin: Package sources from dotnet-aspnetcore -->
44-
<add key="darc-int-dotnet-aspnetcore-1d69605-1" value="true" />
45-
<add key="darc-int-dotnet-aspnetcore-1d69605-2" value="true" />
46-
<add key="darc-int-dotnet-aspnetcore-1d69605" value="true" />
4747
<!-- End: Package sources from dotnet-aspnetcore -->
4848
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4949
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5050
<!-- Begin: Package sources from dotnet-runtime -->
5151
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
5252
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
53+
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="true" />
54+
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="true" />
5355
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
5456
<!-- End: Package sources from dotnet-runtime -->
5557
<!-- Begin: Package sources from dotnet-templating -->
58+
<add key="darc-int-dotnet-templating-f9d1cd9-1" value="true" />
59+
<add key="darc-int-dotnet-templating-f9d1cd9-2" value="true" />
5660
<add key="darc-int-dotnet-templating-f9d1cd9" value="true" />
5761
<!-- End: Package sources from dotnet-templating -->
5862
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5963
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="true" />
6064
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="true" />
65+
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-3" value="true" />
66+
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-4" value="true" />
6167
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="true" />
6268
<!-- End: Package sources from dotnet-windowsdesktop -->
6369
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,22 @@
296296
</Dependency>
297297
</ProductDependencies>
298298
<ToolsetDependencies>
299-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
299+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
301+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
302302
<SourceBuild RepoName="arcade" ManagedOnly="true" />
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
304+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
306+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24204.4">
308+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.24266.4">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
310+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
312+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24266.4">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
314+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
315315
</Dependency>
316316
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0">
317317
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
2828
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
2929
<SystemSecurityCryptographyPkcsPackageVersion>6.0.4</SystemSecurityCryptographyPkcsPackageVersion>
30-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24204.4</MicrosoftDotNetSignToolVersion>
30+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.24266.4</MicrosoftDotNetSignToolVersion>
3131
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
3232
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
3333
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -166,7 +166,7 @@
166166
<PropertyGroup>
167167
<FluentAssertionsVersion>4.19.2</FluentAssertionsVersion>
168168
<FluentAssertionsJsonVersion>4.19.0</FluentAssertionsJsonVersion>
169-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24204.4</MicrosoftDotNetXUnitExtensionsVersion>
169+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24266.4</MicrosoftDotNetXUnitExtensionsVersion>
170170
<MoqPackageVersion>4.8.2</MoqPackageVersion>
171171
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.21376.2</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
172172
</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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.128",
3+
"dotnet": "6.0.130",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@@ -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)