Skip to content

Commit 46b4ef2

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.3xx
2 parents 6c4ad5e + 41d0a20 commit 46b4ef2

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

NuGet.config

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-aspnetcore -->
2727
<add key="darc-int-dotnet-aspnetcore-215a587" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-2/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-1/nuget/v3/index.json" />
3028
<!-- End: Package sources from dotnet-aspnetcore -->
3129
<!-- Begin: Package sources from dotnet-emsdk -->
30+
<add key="darc-pub-dotnet-emsdk-0bcc3e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67/nuget/v3/index.json" />
31+
<add key="darc-pub-dotnet-emsdk-0bcc3e6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-1/nuget/v3/index.json" />
3232
<!-- End: Package sources from dotnet-emsdk -->
3333
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3434
<add key="darc-pub-DotNet-msbuild-Trusted-3e6a44d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-3e6a44de/nuget/v3/index.json" />
@@ -37,16 +37,12 @@
3737
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3838
<!-- Begin: Package sources from dotnet-runtime -->
3939
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-2/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
4240
<!-- End: Package sources from dotnet-runtime -->
4341
<!-- Begin: Package sources from dotnet-templating -->
4442
<add key="darc-pub-dotnet-templating-8f75dca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8f75dca0/nuget/v3/index.json" />
4543
<!-- End: Package sources from dotnet-templating -->
4644
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4745
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3/nuget/v3/index.json" />
48-
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-2/nuget/v3/index.json" />
49-
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-1/nuget/v3/index.json" />
5046
<!-- End: Package sources from dotnet-windowsdesktop -->
5147
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5248
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -77,18 +73,12 @@
7773
<!-- Begin: Package sources from dotnet-templating -->
7874
<!-- End: Package sources from dotnet-templating -->
7975
<!-- Begin: Package sources from dotnet-aspnetcore -->
80-
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="true" />
81-
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="true" />
8276
<add key="darc-int-dotnet-aspnetcore-215a587" value="true" />
8377
<!-- End: Package sources from dotnet-aspnetcore -->
8478
<!-- Begin: Package sources from dotnet-runtime -->
85-
<add key="darc-int-dotnet-runtime-aae90fa-1" value="true" />
86-
<add key="darc-int-dotnet-runtime-aae90fa-2" value="true" />
8779
<add key="darc-int-dotnet-runtime-aae90fa" value="true" />
8880
<!-- End: Package sources from dotnet-runtime -->
8981
<!-- Begin: Package sources from dotnet-windowsdesktop -->
90-
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="true" />
91-
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="true" />
9282
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="true" />
9383
<!-- End: Package sources from dotnet-windowsdesktop -->
9484
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Uri>https://github.com/dotnet/core-setup</Uri>
6060
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
62+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
6363
<Uri>https://github.com/dotnet/emsdk</Uri>
6464
<Sha>0bcc3e67026ea44a16fb018a50e4e134c06ab3d6</Sha>
6565
</Dependency>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependency from https://github.com/dotnet/winforms -->
84-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.7-servicing.25316.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
84+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.8-servicing.25368.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8585
</PropertyGroup>
8686
<PropertyGroup>
8787
<!-- Dependencies from https://github.com/dotnet/runtime -->

0 commit comments

Comments
 (0)