Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit537ecf8

Browse files
wtgodbemmitcheNikolaMilosavljevic
authored
[release/10.0.1xx] Fix aspnetcoremodule signing for installers (#2540)
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
1 parent4f9d996 commit537ecf8

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

‎src/arcade/src/Microsoft.DotNet.Build.Tasks.Installers/src/CreateWixBuildWixpack.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public class CreateWixBuildWixpack : Task
7171
[Required]
7272
publicITaskItem[]SourceFiles{get;set;}
7373

74+
publicstring[]SuppressSpecificWarnings{get;set;}
75+
7476
[Required]
7577
publicstringWixpackWorkingDir{get;set;}
7678

@@ -334,6 +336,15 @@ private void GenerateWixBuildCommandLineFile()
334336
}
335337
}
336338

339+
// Add each Warning from SuppressSpecificWarnings array
340+
if(SuppressSpecificWarnings!=null&&SuppressSpecificWarnings.Length>0)
341+
{
342+
foreach(varwarninginSuppressSpecificWarnings)
343+
{
344+
commandLineArgs.Add($"-sw{warning}");
345+
}
346+
}
347+
337348
// Add all define constants from dictionary
338349
if(_defineConstantsDictionary!=null&&_defineConstantsDictionary.Count>0)
339350
{
@@ -408,7 +419,11 @@ private void GenerateWixBuildCommandLineFile()
408419
}
409420
}
410421

411-
stringcommandLine="wix.exe build "+string.Join(" ",commandLineArgs);
422+
// The command lines can be quite long, and cmd would reject them. Wix does support
423+
// response files, so create a response file (create.rsp) to package alongside.
424+
File.WriteAllText(Path.Combine(WixpackWorkingDir,"create.rsp"),string.Join(System.Environment.NewLine,commandLineArgs));
425+
426+
stringcommandLine="wix.exe build @create.rsp";
412427

413428
StringBuildercreateCmdFileContents=new();
414429
createCmdFileContents.AppendLine("@echo off");

‎src/aspnetcore/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
<ImportProject="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
<ImportProject="..\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/aspnetcore/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
<ImportProject="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
<ImportProject="..\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/aspnetcore/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)
[8]ページ先頭
©2009-2025 Movatter.jp