Home Explore Help
Sign In
dotnet
/
aspnetcore
mirror of https://github.com/dotnet/aspnetcore.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: fa196c8de8
Branches Tags
aspnetcore
/
modules
/
IISIntegration

IISIntegration 740 B
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 
  1. commit cb49b98b6faed397d69078d5a128bed7cef9e563
    2. 

  2. Author: Justin Kotalik <[email protected]>
    3. 

  3. Date:   Thu Mar 8 16:28:27 2018 -0800
    4. 

  4. 

  5.     Follow windows conventions for file versions (#646)
    6. 

  6. 

  7. diff --git a/build/Build.Settings b/build/Build.Settings
    8. 

  8. index f347d3119b7..9daccf4aaab 100644
    9. 

  9. --- a/build/Build.Settings
    10. 

  10. +++ b/build/Build.Settings
    11. 

  11. @@ -87,7 +87,7 @@
    12. 

  12.    <PropertyGroup>
    13. 

  13.      <_TwoDigitYear>$([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2000))</_TwoDigitYear>
    14. 

  14.      <_ThreeDigitDayOfYear>$([System.DateTime]::UtcNow.DayOfYear.ToString().PadLeft(3, '0'))</_ThreeDigitDayOfYear>
    15. 

  15. -    <AssemblyRevision>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</AssemblyRevision>
    16. 

  16. +    <AssemblyBuild>$(_TwoDigitYear)$(_ThreeDigitDayOfYear)</AssemblyBuild>
    17. 

  17.    </PropertyGroup>
    18. 

  18.  
    19. 

  19.   </Project>
    20. 

  20. \ No newline at end of file
    21. 

  21. diff --git a/src/AspNetCore/AspNetCore.vcxproj b/src/AspNetCore/AspNetCore.vcxproj
    22. 

  22. index 346e1f039f1..675ae4cb872 100644
    23. 

  23. --- a/src/AspNetCore/AspNetCore.vcxproj
    24. 

  24. +++ b/src/AspNetCore/AspNetCore.vcxproj
    25. 

  25. @@ -234,10 +234,10 @@
    26. 

  26.        <VersionHeaderContents Include="%0a" />
    27. 

  27.        <VersionHeaderContents Include="// This file is auto-generated" />
    28. 

  28.        <VersionHeaderContents Include="%0a" />
    29. 

  29. -      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
    30. 

  30. -      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
    31. 

  31. -      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
    32. 

  32. -      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
    33. 

  33. +      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
    34. 

  34. +      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
    35. 

  35. +      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
    36. 

  36. +      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
    37. 

  37.        <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
    38. 

  38.      </ItemGroup>
    39. 

  39.      <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
    40. 

  40. diff --git a/src/RequestHandler/RequestHandler.vcxproj b/src/RequestHandler/RequestHandler.vcxproj
    41. 

  41. index cd074c4d756..a94bfb248d2 100644
    42. 

  42. --- a/src/RequestHandler/RequestHandler.vcxproj
    43. 

  43. +++ b/src/RequestHandler/RequestHandler.vcxproj
    44. 

  44. @@ -245,10 +245,10 @@
    45. 

  45.        <VersionHeaderContents Include="%0a" />
    46. 

  46.        <VersionHeaderContents Include="// This file is auto-generated" />
    47. 

  47.        <VersionHeaderContents Include="%0a" />
    48. 

  48. -      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
    49. 

  49. -      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
    50. 

  50. -      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AspNetCoreModuleVersionPatch),$(AssemblyRevision)" />
    51. 

  51. -      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AspNetCoreModuleVersionPatch).$(AssemblyRevision)\0&quot;" />
    52. 

  52. +      <VersionHeaderContents Include="#define FileVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
    53. 

  53. +      <VersionHeaderContents Include="#define FileVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
    54. 

  54. +      <VersionHeaderContents Include="#define ProductVersion $(AspNetCoreModuleVersionMajor),$(AspNetCoreModuleVersionMinor),$(AssemblyBuild),$(AspNetCoreModuleVersionRevision)" />
    55. 

  55. +      <VersionHeaderContents Include="#define ProductVersionStr &quot;$(AspNetCoreModuleVersionMajor).$(AspNetCoreModuleVersionMinor).$(AssemblyBuild).$(AspNetCoreModuleVersionRevision)\0&quot;" />
    56. 

  56.        <VersionHeaderContents Include="#define PlatformToolset &quot;$(PlatformToolset)\0&quot;" />
    57. 

  57.      </ItemGroup>
    58. 

  58.      <WriteLinesToFile File="version.h" Lines="@(VersionHeaderContents)" OverWrite="true" WriteOnlyWhenDifferent="True" />
    59. 

  59. diff --git a/version.props b/version.props
    60. 

  60. index c69e0751d9a..0f0009b5557 100644
    61. 

  61. --- a/version.props
    62. 

  62. +++ b/version.props
    63. 

  63. @@ -10,6 +10,6 @@
    64. 

  64.      <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
    65. 

  65.      <AspNetCoreModuleVersionMajor>8</AspNetCoreModuleVersionMajor>
    66. 

  66.      <AspNetCoreModuleVersionMinor>1</AspNetCoreModuleVersionMinor>
    67. 

  67. -    <AspNetCoreModuleVersionPatch>0</AspNetCoreModuleVersionPatch>
    68. 

  68. +    <AspNetCoreModuleVersionRevision>0</AspNetCoreModuleVersionRevision>
    69. 

  69.    </PropertyGroup>
    70. 

  70.  </Project>
    71.