Skip to content

Commit ba73820

Browse files
authored
Merge branch 'main' into marcpopMSFT-stableemsdk
2 parents e8bb86a + 0df2abd commit ba73820

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-dotnet -->
10-
<add key="darc-int-dotnet-dotnet-ca1bc71" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-ca1bc715/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-dotnet -->
1212
<!-- Begin: Package sources from dotnet-android -->
1313
<add key="darc-pub-dotnet-android-f90e889" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-f90e889a/nuget/v3/index.json" />
@@ -38,7 +38,7 @@
3838
<clear />
3939
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4040
<!-- Begin: Package sources from dotnet-dotnet -->
41-
<add key="darc-int-dotnet-dotnet-ca1bc71" value="true" />
41+
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
4242
<!-- End: Package sources from dotnet-dotnet -->
4343
<!-- Begin: Package sources from dotnet-maui -->
4444
<!-- End: Package sources from dotnet-maui -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.100">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
6-
<Sha>ca1bc715bc03b6b12bcc9f91f8fc50e2ff74856d</Sha>
6+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
99
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-10.0.100" Version="10.0.100">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11-
<Sha>ca1bc715bc03b6b12bcc9f91f8fc50e2ff74856d</Sha>
11+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.0.14">
1414
<Uri>https://github.com/dotnet/android</Uri>
@@ -34,9 +34,9 @@
3434
<Uri>https://github.com/dotnet/maui</Uri>
3535
<Sha>d9f2e2f6ef58af3d580242dfcac2fbe1b242e484</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25523.104">
37+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25523.112">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39-
<Sha>ca1bc715bc03b6b12bcc9f91f8fc50e2ff74856d</Sha>
39+
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</PropertyGroup>
6363
<PropertyGroup Label="MonoWorkloads">
6464
<MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion>10.0.100</MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion>
65-
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25523.104</MicrosoftNETSdkPackageVersion>
65+
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25523.112</MicrosoftNETSdkPackageVersion>
6666
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
6767
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MonoWorkloadManifestVersion>
6868
<!-- mono workload prerelease version band must match the runtime feature band -->

0 commit comments

Comments
 (0)