Skip to content

Commit 0dee8e5

Browse files
mmitchemmitche
committed
Update to arcade with WiX fix (225814)
1 parent 43882c2 commit 0dee8e5

File tree

8 files changed

+30
-24
lines changed

8 files changed

+30
-24
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<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" />
8+
<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" />
9+
<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" />
10+
<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" />
11+
<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" />
812
<!-- End: Package sources from dotnet-runtime -->
913
<!-- Begin: Package sources from dotnet-efcore -->
10-
<add key="darc-int-dotnet-efcore-ec0fd22" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-ec0fd22a/nuget/v3/index.json" />
1114
<!-- End: Package sources from dotnet-efcore -->
1215
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1316
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,9 +28,12 @@
2528
<clear />
2629
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2730
<!-- Begin: Package sources from dotnet-efcore -->
28-
<add key="darc-int-dotnet-efcore-ec0fd22" value="true" />
2931
<!-- End: Package sources from dotnet-efcore -->
3032
<!-- Begin: Package sources from dotnet-runtime -->
33+
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
34+
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
35+
<add key="darc-int-dotnet-runtime-97d8f4c-3" value="true" />
36+
<add key="darc-int-dotnet-runtime-97d8f4c-4" value="true" />
3137
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
3238
<!-- End: Package sources from dotnet-runtime -->
3339
<!--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
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>1b9707a1fa56abb49ac8a286fd89a91527b6c7d3</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24266.4">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
285+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24266.4">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
290+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24266.4">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
294+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24266.4">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
298+
<Sha>2eab07c3d7b78219d10099b19fafeef2ecae1779</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.30</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.30</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24266.4</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.129"
3+
"version": "6.0.130"
44
},
55
"tools": {
6-
"dotnet": "6.0.129",
6+
"dotnet": "6.0.130",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.19",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4"
3434
}
3535
}

0 commit comments

Comments
 (0)