Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 2153bca

Browse files
committed
Fixing exec with line breaks on windows now, affected by the same MSBuild change that changed how exec treats line endings.
1 parent 48ed870 commit 2153bca

1 file changed

Lines changed: 46 additions & 46 deletions

File tree

build/package/Installer.MSI.targets

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@
102102
Inputs="@(GenerateSdkMsiInputs)"
103103
Outputs="$(SdkInstallerFile)">
104104

105-
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript)
106-
'$(SdkLayoutOutputDirectory)'
107-
'$(SdkInstallerFile)'
108-
'$(WixRoot)'
109-
'$(SdkBrandName)'
110-
'$(MsiVersion)'
111-
'$(SimpleVersion)'
112-
'$(NugetVersion)'
113-
'$(SdkInstallerUpgradeCode)'
114-
'$(Architecture)'
115-
'$(SdkStableFileIdForApphostTransform)'
105+
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
106+
'$(SdkLayoutOutputDirectory)' ^
107+
'$(SdkInstallerFile)' ^
108+
'$(WixRoot)' ^
109+
'$(SdkBrandName)' ^
110+
'$(MsiVersion)' ^
111+
'$(SimpleVersion)' ^
112+
'$(NugetVersion)' ^
113+
'$(SdkInstallerUpgradeCode)' ^
114+
'$(Architecture)' ^
115+
'$(SdkStableFileIdForApphostTransform)' ^
116116
" />
117117
</Target>
118118

@@ -122,15 +122,15 @@
122122
Inputs="@(GenerateMSBuildExtensionsMsiInputs)"
123123
Outputs="$(MSBuildExtensionsInstallerFile)">
124124

125-
<Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript)
126-
'$(MSBuildExtensionsOutputDirectory)'
127-
'$(MSBuildExtensionsInstallerFile)'
128-
'$(WixRoot)'
129-
'$(MSBuildExtensionsBrandName)'
130-
'$(SimpleVersion)'
131-
'$(SimpleVersion)'
132-
'$(NugetVersion)'
133-
'$(MSBuildExtensionsInstallerUpgradeCode)'
125+
<Exec Command="powershell -NoProfile -NoLogo $(MSBuildExtensionsGenerateMsiPowershellScript) ^
126+
'$(MSBuildExtensionsOutputDirectory)' ^
127+
'$(MSBuildExtensionsInstallerFile)' ^
128+
'$(WixRoot)' ^
129+
'$(MSBuildExtensionsBrandName)' ^
130+
'$(SimpleVersion)' ^
131+
'$(SimpleVersion)' ^
132+
'$(NugetVersion)' ^
133+
'$(MSBuildExtensionsInstallerUpgradeCode)' ^
134134
'$(Architecture)'" />
135135
</Target>
136136

@@ -144,21 +144,21 @@
144144
$(SdkGenerateBundlePowershellScript)"
145145
Outputs="$(CombinedFrameworkSdkHostInstallerFile)">
146146

147-
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript)
148-
'$(SdkInstallerFile)'
149-
'$(DownloadedAspNetCoreSharedFxInstallerFile)'
150-
'$(DownloadedSharedFrameworkInstallerFile)'
151-
'$(DownloadedHostFxrInstallerFile)'
152-
'$(DownloadedSharedHostInstallerFile)'
153-
'$(CombinedFrameworkSdkHostInstallerFile)'
154-
'$(WixRoot)'
155-
'$(SdkBrandName)'
156-
'$(MsiVersion)'
157-
'$(SimpleVersion)'
158-
'$(NugetVersion)'
159-
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)'
160-
'$(Architecture)'
161-
'$(MicrosoftNETCoreAppPackageVersion)'
147+
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
148+
'$(SdkInstallerFile)' ^
149+
'$(DownloadedAspNetCoreSharedFxInstallerFile)' ^
150+
'$(DownloadedSharedFrameworkInstallerFile)' ^
151+
'$(DownloadedHostFxrInstallerFile)' ^
152+
'$(DownloadedSharedHostInstallerFile)' ^
153+
'$(CombinedFrameworkSdkHostInstallerFile)' ^
154+
'$(WixRoot)' ^
155+
'$(SdkBrandName)' ^
156+
'$(MsiVersion)' ^
157+
'$(SimpleVersion)' ^
158+
'$(NugetVersion)' ^
159+
'$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
160+
'$(Architecture)' ^
161+
'$(MicrosoftNETCoreAppPackageVersion)' ^
162162
'$(AspNetCoreVersion)'" />
163163
</Target>
164164

@@ -170,10 +170,10 @@
170170
$(SdkGenerateNupkgPowershellScript)"
171171
Outputs="$(SdkInstallerNupkgFile)">
172172

173-
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
174-
'$(CombinedFrameworkSdkHostInstallerFile)'
175-
'$(SuffixedNugetVersion)'
176-
'$(SdkInstallerNuspecFile)'
173+
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
174+
'$(CombinedFrameworkSdkHostInstallerFile)' ^
175+
'$(SuffixedNugetVersion)' ^
176+
'$(SdkInstallerNuspecFile)' ^
177177
'$(SdkInstallerNupkgFile)'" />
178178
</Target>
179179

@@ -185,10 +185,10 @@
185185
$(SdkGenerateNupkgPowershellScript)"
186186
Outputs="$(SdkMSBuildExtensionsNupkgFile);$(SdkMSBuildExtensionsSwrFile)">
187187

188-
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript)
189-
'$(MSBuildExtensionsLayoutDirectory)'
190-
'$(SuffixedNugetVersion)'
191-
'$(SdkMSBuildExtensionsNuspecFile)'
188+
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
189+
'$(MSBuildExtensionsLayoutDirectory)' ^
190+
'$(SuffixedNugetVersion)' ^
191+
'$(SdkMSBuildExtensionsNuspecFile)' ^
192192
'$(SdkMSBuildExtensionsNupkgFile)'" />
193193

194194
<GenerateMSBuildExtensionsSWR MSBuildExtensionsLayoutDirectory="$(MSBuildExtensionsLayoutDirectory)"
@@ -202,9 +202,9 @@
202202
DependsOnTargets="Init;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
203203
Condition=" '$(OS)' == 'Windows_NT'" >
204204

205-
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
206-
-InputMsi '$(SdkInstallerFile)'
207-
-DotnetDir '$(PreviousStageDirectory)'
205+
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript) ^
206+
-InputMsi '$(SdkInstallerFile)' ^
207+
-DotnetDir '$(PreviousStageDirectory)' ^
208208
-TestDir '$(TestOutputDir)'" />
209209

210210
<WriteLinesToFile

0 commit comments

Comments
 (0)