Skip to content

Commit 8536df8

Browse files
mmitchemmitche
committed
Update to arcade with WiX fix (225814)
1 parent dd5c789 commit 8536df8

File tree

8 files changed

+38
-30
lines changed

8 files changed

+38
-30
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
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-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
13+
<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" />
14+
<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" />
15+
<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" />
16+
<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" />
1317
<!-- End: Package sources from dotnet-runtime -->
1418
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1519
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,6 +26,10 @@
2226
<clear />
2327
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2428
<!-- Begin: Package sources from dotnet-runtime -->
29+
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
30+
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
31+
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="true" />
32+
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="true" />
2533
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
2634
<!-- End: Package sources from dotnet-runtime -->
2735
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>
42-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
42+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
44+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
46+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24266.4">
4747
<Uri>https://github.com/dotnet/arcade</Uri>
48-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
48+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
50+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24266.4">
5151
<Uri>https://github.com/dotnet/arcade</Uri>
52-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
52+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
54+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24266.4">
5555
<Uri>https://github.com/dotnet/arcade</Uri>
56-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
56+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
58+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24266.4">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
60+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
62+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24266.4">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
64+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
66+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24266.4">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
68+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
6969
</Dependency>
7070
</ToolsetDependencies>
7171
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<!--Package versions-->
5050
<PropertyGroup>
5151
<!-- arcade -->
52-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksFeedVersion>
53-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksArchivesVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
56-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24204.4</MicrosoftDotNetVersionToolsTasksVersion>
52+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksFeedVersion>
53+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksArchivesVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksInstallersVersion>
56+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24266.4</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
5858
<MicrosoftNETCoreAppRefVersion>6.0.30</MicrosoftNETCoreAppRefVersion>
5959
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.30</MicrosoftNETCoreAppRuntimewinx64Version>

‎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,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.128"
3+
"dotnet": "6.0.130"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24204.4",
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24266.4",
88
"Microsoft.Build.NoTargets": "1.0.53"
99
}
1010
}

0 commit comments

Comments
 (0)