Skip to content

Commit a8a4f36

Browse files
[main] Source code updates from dotnet/dotnet (#63852)
[main] Source code updates from dotnet/dotnet
1 parent 57d9abe commit a8a4f36

File tree

7 files changed

+286
-287
lines changed

7 files changed

+286
-287
lines changed

eng/Version.Details.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"jdk": "latest"
3333
},
3434
"msbuild-sdks": {
35-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25474.105",
36-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25474.105",
37-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25474.105",
35+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25476.103",
36+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25476.103",
37+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25476.103",
3838
"Microsoft.Build.NoTargets": "3.7.0",
3939
"Microsoft.Build.Traversal": "3.4.0",
4040
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
44
<PropertyGroup>
5-
<Name>AspNetCoreModuleV2IISExpress</Name>
65
<IsShipping>true</IsShipping>
76
<ProjectGuid>17c76489-4c09-4e14-b81c-7a86cd937144</ProjectGuid>
87
<OutputType>Package</OutputType>
9-
<OutputName>$(Name)_$(Platform)</OutputName>
8+
<OutputName>ancm_iis_express_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
109
<SuppressIces>ICE03</SuppressIces>
1110
<DisableGuidGeneration>true</DisableGuidGeneration>
1211
<SchemaVersion>2.0</SchemaVersion>
@@ -64,7 +63,7 @@
6463
<Import Project="..\build\settings.props" />
6564

6665
<PropertyGroup>
67-
<PackageFileName>ancm_iis_express_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
66+
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
6867
<ProductNameShort>ASP.NET Core Module IIS Express V2</ProductNameShort>
6968
</PropertyGroup>
7069

src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<Project>
33
<Import Project="Sdk.props" Sdk="Microsoft.WixToolset.Sdk" />
44
<PropertyGroup>
5-
<Name>AspNetCoreModuleV2</Name>
65
<IsShipping>true</IsShipping>
76
<ProjectGuid>f9bacb48-3bd7-4ec2-ae31-664e8703ec12</ProjectGuid>
87
<OutputType>Package</OutputType>
9-
<OutputName>$(Name)_$(Platform)</OutputName>
8+
<OutputName>aspnetcoremodule_$(Platform)_en_v2_$(_ProductVersionForInstallers)</OutputName>
109
<GenerateRandomNamespaceGuid>true</GenerateRandomNamespaceGuid>
1110
<SchemaVersion>2.0</SchemaVersion>
1211
<DisableGuidGeneration>true</DisableGuidGeneration>
@@ -49,7 +48,7 @@
4948
<Import Project="..\build\settings.props" />
5049

5150
<PropertyGroup>
52-
<PackageFileName>aspnetcoremodule_$(Platform)_en_v2_$(PackageVersion)$(TargetExt)</PackageFileName>
51+
<PackageFileName>$(OutputName)$(TargetExt)</PackageFileName>
5352
<ProductNameShort>ASP.NET Core Module V2</ProductNameShort>
5453
</PropertyGroup>
5554

src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@
7575
<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;." />
7676
<!--_locComment_text="'here' is to be translated"-->
7777
<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;." />
78-
</WixLocalization>
78+
</WixLocalization>

src/Installers/Windows/Wix.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
130130
PdbType="$(DebugType)"
131131
SourceFiles="@(Compile)"
132+
SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
132133
LocalizationFiles="@(_WixLocalizationFile)"
133134
BindPaths="@(BindPath)"
134135
WixpackWorkingDir="$(WixpackWorkingDir)">

0 commit comments

Comments
 (0)