Skip to content

Commit 01b0c88

Browse files
authored
Flow ANCM version number in the build output (#9269)
* Update IIS libraries to platform toolset v142 * Drop ancm version into a text file next to the installer * feedback and try reverting removal of VC++ 141 tools to fix build
1 parent 004ac25 commit 01b0c88

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

korebuild.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
"requiredWorkloads": [
1717
"Microsoft.VisualStudio.Component.VC.ATL",
1818
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
19-
"Microsoft.VisualStudio.Component.VC.v141.ATL",
20-
"Microsoft.VisualStudio.Component.VC.v141.x86.x64",
2119
"Microsoft.VisualStudio.Component.Windows10SDK.17134"
2220
]
2321
}

src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4343
<PropertyGroup>
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)'=='Release'">

src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3232
<PropertyGroup>
3333
<ConfigurationType>StaticLibrary</ConfigurationType>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)'=='Release'">
3737
<WholeProgramOptimization>false</WholeProgramOptimization>

src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4848
<PropertyGroup>
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
50-
<PlatformToolset>v141</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)'=='Release'">
5353
<WholeProgramOptimization>true</WholeProgramOptimization>

src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<PropertyGroup>
7575
<ConfigurationType>StaticLibrary</ConfigurationType>
7676
<CharacterSet>Unicode</CharacterSet>
77-
<PlatformToolset>v141</PlatformToolset>
77+
<PlatformToolset>v142</PlatformToolset>
7878
</PropertyGroup>
7979
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8080
<PropertyGroup Label="Configuration">

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,12 @@
308308
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
309309
<ImportGroup Label="ExtensionTargets">
310310
</ImportGroup>
311+
<Target Name="AfterBuild">
312+
<!-- Drop a file in the artifacts directory containing the ANCM version number -->
313+
<ItemGroup>
314+
<VersionFileContents Include="$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)" />
315+
<VersionFileContents Include="$(SourceRevisionId)" />
316+
</ItemGroup>
317+
<WriteLinesToFile File="$(InstallersOutputPath)aspnetcoremodule.version" Lines="@(VersionFileContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
318+
</Target>
311319
</Project>

0 commit comments

Comments
 (0)