Flow ANCM version number in the build output #9269
Conversation
eng/scripts/vs.buildtools.json
Outdated
| @@ -17,8 +17,6 @@ | |||
| "Microsoft.VisualStudio.Component.NuGet.BuildTools", | |||
| "Microsoft.VisualStudio.Component.VC.ATL", | |||
| "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", | |||
| "Microsoft.VisualStudio.Component.VC.v141.ATL", | |||
There was a problem hiding this comment.
IIRC there wasn't a v142 equivalent for this package. As long as things build correct, I think we are fine to remove this.
There was a problem hiding this comment.
"Microsoft.VisualStudio.Component.VC.ATL" is the v142 equivalent, and it's listed already. :)
There was a problem hiding this comment.
Yep, I came to the same conclusion looking at the component directory: https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2019
| @@ -4,7 +4,7 @@ | |||
| <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)..\</SolutionDir> | |||
| <Configuration Condition="'$(Configuration)'==''">Debug</Configuration> | |||
| <Platform Condition="'$(Platform)' == ''">Win32</Platform> | |||
| <PlatformToolset>v141</PlatformToolset> | |||
| <PlatformToolset>v142</PlatformToolset> | |||
There was a problem hiding this comment.
Ah, I think I missed this one before. When you open the IIS sln now, do you get a warning about needing to upgrade to v142 still?
There was a problem hiding this comment.
When you open the IIS sln now, do you get a warning about needing to upgrade to v142 still
You do not.
| <Target Name="AfterBuild"> | ||
| <!-- Drop a file in the artifacts directory containing the ANCM version number --> | ||
| <ItemGroup> | ||
| <VersionFileContents Include="$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)" /> |
There was a problem hiding this comment.
I'm going to want to verify these numbers tomorrow. I don't believe these are correct, but want to confirm before I correct you.
| <!-- Drop a file in the artifacts directory containing the ANCM version number --> | ||
| <ItemGroup> | ||
| <VersionFileContents Include="$(AspNetCoreModuleVersionMajor).$(AspNetCoreMinorVersion).$(AssemblyBuild).$(AspNetCorePatchVersion)" /> | ||
| <VersionFileContents Include="$(CommitHash)" /> |
There was a problem hiding this comment.
| <VersionFileContents Include="$(CommitHash)" /> | |
| <VersionFileContents Include="$(SourceRevisionId)" /> |
CommitHash is going to be deprecated. SourceRevisionId is a well-known, built-in property in Microsoft.Common.targets available after the InitializeSourceControlInformation target . Example usage:
There was a problem hiding this comment.
Awesome, I'm glad this is in Microsoft.Common.targets now!
Looking at the release pipeline, it appears that will happen automatically. |
|
Looks like there is something broken about the C++ resolution with this fix: |
This reverts commit 01b0c88.
amcasey
added
area-networking
Fixes #4016
Also fixes #7548 because I was getting build errors that told me I should update them to v142 anyway :)
This drops a file:
artifacts/installers/aspnetcoremodule.versionwith contents like:Still outstanding (need some assistance from @aspnet/build): working out how we could flow this forward to the final build output. This needs a little more understanding of Maestro/BAR than I have off-hand. I can add it to the manifest in Maestro.csproj but I'm not sure of how that all flows to the final output drop.