Properly set the assembly version

Add Directory.Build.rsp with the recommended MSBuild command-line arguments
gluck · Dec 24, 2023 · b665979 · b665979
1 parent 57ee81a
commit b665979
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
@@ -0,0 +1 @@
+/r /m /bl /nologo /verbosity:minimal /clp:Summary;ForceNoAlign
diff --git a/ILRepack/ILRepack.csproj b/ILRepack/ILRepack.csproj
@@ -5,11 +5,14 @@
     <TargetFramework>net472</TargetFramework>
     <Product>ILRepack</Product>
     <Copyright>Copyright © Francois Valdy 2011</Copyright>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
+    <Version>2.0.19</Version>
+    <AssemblyVersion>$(Version).0</AssemblyVersion>
+    <FileVersion>$(Version).0</FileVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <DebugType>embedded</DebugType>
+    <!-- Generated NuGet package doesn't have the target framework dependency, and we're OK with that -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <None Include="ILRepack.snk" CopyToOutputDirectory="PreserveNewest" />
@@ -33,7 +36,6 @@
 
   <Target Name="PrepareNupkgInfo">
     <PropertyGroup>
-      <Version>2.0.19</Version>
       <ILRepackNuspecPath>$(MSBuildThisFileDirectory)..\ILRepack.nuspec</ILRepackNuspecPath>
       <ILRepackLibNuspecPath>$(MSBuildThisFileDirectory)..\ILRepack.Lib.nuspec</ILRepackLibNuspecPath>
       <ILRepackNupkgPath>$(OutDir)ILRepack.$(Version).nupkg</ILRepackNupkgPath>
@@ -50,13 +52,13 @@
       Outputs="$(StandaloneILRepackExe);$(StandaloneILRepackDll)">
     <MakeDir Directories="$(OutDir)Repacked" />
     <Exec
-        Command="&quot;$(TargetPath)&quot; /log /wildcards /internalize /ndebug /keyfile:ILRepack.snk /out:Repacked\ILRepack.exe $(DependencyDllList)" 
-        WorkingDirectory="$(OutDir)"
-        ConsoleToMSBuild="True" />
-    <Exec
-        Command="&quot;$(TargetPath)&quot; /log /wildcards /internalize /ndebug /keyfile:ILRepack.snk /out:Repacked\ILRepack.dll /target:library $(DependencyDllList)" 
+        Command="&quot;$(TargetPath)&quot; /log /wildcards /internalize /ndebug /ver:$(AssemblyVersion) /keyfile:ILRepack.snk /out:Repacked\ILRepack.exe $(DependencyDllList)" 
         WorkingDirectory="$(OutDir)"
         ConsoleToMSBuild="True" />
+    <Copy 
+        SourceFiles="$(OutDir)Repacked\ILRepack.exe" 
+        DestinationFiles="$(OutDir)Repacked\ILRepack.dll"
+        SkipUnchangedFiles="True" />
   </Target>
 
   <Target Name="PackNuGet"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/r /m /bl /nologo /verbosity:minimal /clp:Summary;ForceNoAlign