Skip to content

Commit 9a90ec1

Browse files
[main] Source code updates from dotnet/emsdk (#972)
[main] Source code updates from dotnet/emsdk
1 parent db9af8d commit 9a90ec1

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

src/emsdk/eng/Version.Details.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="ac2aaf24d127067df385f2aa5ab35bb9b96d5f74" BarId="270450" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="62e9d324a3c6678a0415b12af92354b6b03677c8" BarId="270603" />
44
<ProductDependencies>
55
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport" Version="10.0.0-alpha.1.25301.1">
66
<Uri>https://github.com/dotnet/binaryen</Uri>
@@ -236,33 +236,33 @@
236236
<Uri>https://github.com/dotnet/llvm-project</Uri>
237237
<Sha>43649018a9ca75bafcb7e9614082a4f2e4ff7ce6</Sha>
238238
</Dependency>
239-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25303.102">
239+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25304.104">
240240
<Uri>https://github.com/dotnet/dotnet</Uri>
241-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
241+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
242242
</Dependency>
243-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25303.102">
243+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25304.104">
244244
<Uri>https://github.com/dotnet/dotnet</Uri>
245-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
245+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
246246
</Dependency>
247-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25303.102">
247+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25304.104">
248248
<Uri>https://github.com/dotnet/dotnet</Uri>
249-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
249+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
250250
</Dependency>
251-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25303.102">
251+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25304.104">
252252
<Uri>https://github.com/dotnet/dotnet</Uri>
253-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
253+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
254254
</Dependency>
255-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25303.102">
255+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25304.104">
256256
<Uri>https://github.com/dotnet/dotnet</Uri>
257-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
257+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
258258
</Dependency>
259-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25303.102">
259+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25304.104">
260260
<Uri>https://github.com/dotnet/dotnet</Uri>
261-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
261+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
262262
</Dependency>
263-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25303.102">
263+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25304.104">
264264
<Uri>https://github.com/dotnet/dotnet</Uri>
265-
<Sha>ac2aaf24d127067df385f2aa5ab35bb9b96d5f74</Sha>
265+
<Sha>62e9d324a3c6678a0415b12af92354b6b03677c8</Sha>
266266
</Dependency>
267267
</ToolsetDependencies>
268268
</Dependencies>

src/emsdk/eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
5858
</PropertyGroup>
5959
<PropertyGroup>
60-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksPackagingVersion>
61-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksTemplatingVersion>
62-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksInstallersVersion>
63-
<MicrosoftDotNetBuildTasksWorkloadsVersion>10.0.0-beta.25303.102</MicrosoftDotNetBuildTasksWorkloadsVersion>
64-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25303.102</MicrosoftDotNetXliffTasksVersion>
60+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25304.104</MicrosoftDotNetBuildTasksPackagingVersion>
61+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25304.104</MicrosoftDotNetBuildTasksTemplatingVersion>
62+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25304.104</MicrosoftDotNetBuildTasksInstallersVersion>
63+
<MicrosoftDotNetBuildTasksWorkloadsVersion>10.0.0-beta.25304.104</MicrosoftDotNetBuildTasksWorkloadsVersion>
64+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25304.104</MicrosoftDotNetXliffTasksVersion>
6565
</PropertyGroup>
6666
<PropertyGroup>
6767
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

src/emsdk/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": "10.0.100-preview.6.25272.112"
3+
"dotnet": "10.0.100-preview.6.25302.104"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25303.102",
7-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25303.102",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25304.104",
7+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25304.104",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

src/source-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
"commitSha": "f251411b761af9a82d96e71f045827602aacd6da"
5858
},
5959
{
60-
"packageVersion": "10.0.0-preview.6.25304.3",
61-
"barId": 270574,
60+
"packageVersion": "10.0.0-preview.6.25305.1",
61+
"barId": 270692,
6262
"path": "emsdk",
6363
"remoteUri": "https://github.com/dotnet/emsdk",
64-
"commitSha": "9ee2989dcf365fa3c9cd9bdc9ddbb079c064b486"
64+
"commitSha": "2e84b71bab3db3811cccded0468b0d5fcf8f9a6b"
6565
},
6666
{
6767
"packageVersion": "14.0.100-beta.25305.2",

0 commit comments

Comments
 (0)