Skip to content

Commit 15dd9ef

Browse files
akoeplingerakoeplinger
committed
Update arcade
1 parent ac52d56 commit 15dd9ef

File tree

5 files changed

+63
-67
lines changed

5 files changed

+63
-67
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24570.4">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24605.2">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
89+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24570.4">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24605.2">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
94+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24570.4">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24605.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
99+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24570.4">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24605.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
103+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24570.4">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24605.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
107+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24570.4">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24605.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
111+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24570.4">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24605.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
115+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24570.4">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24605.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
119+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24570.4">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24605.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
123+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24570.4">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24605.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
127+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24570.4">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24605.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
131+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24570.4">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24605.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
135+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24570.4">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24605.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
139+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24570.4">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24605.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
143+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24570.4">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24605.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
147+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24570.4">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24605.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
151+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24570.4">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24605.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
155+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24570.4">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24605.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
159+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24570.4">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24605.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
163+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24570.4">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24605.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
167+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24571.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>9fca69998474507f6515c1351efe027dbf194c87</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24570.4">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24605.2">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
353+
<Sha>fb642e9ab66f32045891a143a6b8df84b5f15d4e</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,22 @@
8484
<!-- SDK dependencies (also used in wasm build tests -->
8585
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
8686
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24570.4</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24570.4</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24570.4</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24570.4</MicrosoftDotNetXUnitAssertVersion>
92-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.4</MicrosoftDotNetXUnitExtensionsVersion>
93-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24570.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
94-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksArchivesVersion>
95-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksInstallersVersion>
96-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksPackagingVersion>
97-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksTemplatingVersion>
99-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24570.4</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24570.4</MicrosoftDotNetVersionToolsTasksVersion>
102-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24570.4</MicrosoftDotNetPackageTestingVersion>
87+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksFeedVersion>
88+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24605.2</MicrosoftDotNetCodeAnalysisVersion>
89+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24605.2</MicrosoftDotNetGenAPIVersion>
90+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24605.2</MicrosoftDotNetGenFacadesVersion>
91+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24605.2</MicrosoftDotNetXUnitAssertVersion>
92+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24605.2</MicrosoftDotNetXUnitExtensionsVersion>
93+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24605.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
94+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksArchivesVersion>
95+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksInstallersVersion>
96+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksPackagingVersion>
97+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksTemplatingVersion>
99+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24605.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24605.2</MicrosoftDotNetRemoteExecutorVersion>
101+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24605.2</MicrosoftDotNetVersionToolsTasksVersion>
102+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24605.2</MicrosoftDotNetPackageTestingVersion>
103103
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
104104
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
105105
<!-- NuGet dependencies -->

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
portableBuildArgs=
8080
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81-
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
81+
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8282
fi
8383
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \

‎eng/common/native/install-dependencies.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ case "$os" in
4444
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4545
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4646
# brew update --preinstall
47-
48-
# Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984
49-
brew uninstall --ignore-dependencies --force pkg-config@0.29.2
50-
5147
brew bundle --no-upgrade --no-lock --file=- <<EOF
5248
brew "cmake"
5349
brew "icu4c"
5450
brew "openssl@3"
55-
brew "pkg-config"
51+
brew "pkgconf"
5652
brew "python3"
5753
brew "pigz"
5854
EOF

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "9.0.100"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24570.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24605.2",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24605.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.24605.2",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.24565.3"

0 commit comments

Comments
 (0)