Skip to content

Commit c1ababe

Browse files
authored
Merge branch 'main' into copilot/remove-sdk-version
2 parents d2410d5 + 80cf3a3 commit c1ababe

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26154.117">
4+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
55
<Uri>https://github.com/dotnet/dotnet</Uri>
6-
<Sha>6dbf4ee311820b91535cc405fb9f72f3e1ec85fc</Sha>
6+
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26154.117">
9+
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>6dbf4ee311820b91535cc405fb9f72f3e1ec85fc</Sha>
11+
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.2" Version="36.1.99-preview.2.154">
1414
<Uri>https://github.com/dotnet/android</Uri>
@@ -36,9 +36,9 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26154.117">
39+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26159.112">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>6dbf4ee311820b91535cc405fb9f72f3e1ec85fc</Sha>
41+
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
4242
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4343
</Dependency>
4444
</ToolsetDependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup Label="EmscriptenWorkloads">
4141
<!-- Workloads from dotnet/sdk -->
42-
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26154.117</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>
42+
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>
4343
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion)</EmscriptenWorkloadManifestVersion>
4444
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
4545
<EmscriptenWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
@@ -60,7 +60,7 @@
6060
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview2PackageVersion)</XamarinTvOSWorkloadManifestVersion>
6161
</PropertyGroup>
6262
<PropertyGroup Label="MonoWorkloads">
63-
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26154.117</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
63+
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
6464
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview2PackageVersion)</MonoWorkloadManifestVersion>
6565
<!-- mono workload prerelease version band must match the runtime feature band -->
6666
<MonoWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.Build.NoTargets": "3.7.0",
12-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26154.117",
12+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26159.112",
1313
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1414
}
1515
}

0 commit comments

Comments
 (0)