Skip to content

[main] Source code updates from dotnet/dotnet #63852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2025
Merged

[main] Source code updates from dotnet/dotnet #63852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d74449
Backflow from https://github.com/dotnet/dotnet / f4b7bd1 build 284884
dotnet-maestro[bot] Sep 27, 2025
00752cd
Merge main into darc-main-bff52010-d441-4db7-b434-8d8edd00e65e
dotnet-maestro[bot] Sep 27, 2025
3f849c0
Update dependencies from https://github.com/dotnet/dotnet build 284884
dotnet-maestro[bot] Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 92 additions & 92 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25474.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25474.105",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25474.105",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25476.103",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25476.103",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25476.103",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"
Expand Down
5 changes: 2 additions & 3 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
<PropertyGroup>
<Name>AspNetCoreModuleV2IISExpress</Name>
<IsShipping>true</IsShipping>
<ProjectGuid>17c76489-4c09-4e14-b81c-7a86cd937144</ProjectGuid>
<OutputType>Package</OutputType>
<OutputName>$(Name)_$(Platform)</OutputName>
<OutputName>ancm_iis_express_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
<SuppressIces>ICE03</SuppressIces>
<DisableGuidGeneration>true</DisableGuidGeneration>
<SchemaVersion>2.0</SchemaVersion>
Expand Down Expand Up @@ -64,7 +63,7 @@
<Import Project="..\build\settings.props" />

<PropertyGroup>
<PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
<ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
</PropertyGroup>

Expand Down
5 changes: 2 additions & 3 deletions src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
<PropertyGroup>
<Name>AspNetCoreModuleV2</Name>
<IsShipping>true</IsShipping>
<ProjectGuid>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</ProjectGuid>
<OutputType>Package</OutputType>
<OutputName>$(Name)_$(Platform)</OutputName>
<OutputName>aspnetcoremodule_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
<GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
<SchemaVersion>2.0</SchemaVersion>
<DisableGuidGeneration>true</DisableGuidGeneration>
Expand Down Expand Up @@ -49,7 +48,7 @@
<Import Project="..\build\settings.props" />

<PropertyGroup>
<PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
<ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
<String Id="ModifyResetIIS" Value="Please restart IIS after the installation completes. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
<!--_locComment_text="'here' is to be translated"-->
<String Id="ModifyNoIIS" Value="IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information &lt;a href=&quot;https://aka.ms/aspnet/8.0/host-and-deploy-with-iis&quot;&gt;here&lt;/a&gt;." />
</WixLocalization>
</WixLocalization>
1 change: 1 addition & 0 deletions src/Installers/Windows/Wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
PdbType="$(DebugType)"
SourceFiles="@(Compile)"
SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
LocalizationFiles="@(_WixLocalizationFile)"
BindPaths="@(BindPath)"
WixpackWorkingDir="$(WixpackWorkingDir)">
Expand Down
Loading