Update build scripts and projects

VexinSS · Sep 26, 2019 · 19d9607 · 19d9607
1 parent 9a39250
commit 19d9607
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/LICENSE.dnlib.txt b/LICENSE.dnlib.txt
@@ -1,5 +1,5 @@
 <LICENSE>
-    Copyright (C) 2012-2018 [email protected]
+    Copyright (C) 2012-2019 [email protected]
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the

diff --git a/build.cmd b/build.cmd
@@ -4,13 +4,10 @@ msbuild -v:m -restore -t:Build -p:Configuration=Release -p:TargetFramework=net35
 del Release\net35\*.pdb Release\net35\*.xml Release\net35\Test.Rename.* || goto :error
 
 dotnet publish -c Release -f netcoreapp2.1 -o publish-netcoreapp2.1 de4dot || goto :error
-del publish-netcoreapp2.1\*.pdb || goto :error
-del publish-netcoreapp2.1\*.xml || goto :error
-dotnet publish -c Release -f netcoreapp3.0 -o publish-netcoreapp3.0 de4dot || goto :error
-del publish-netcoreapp3.0\*.pdb || goto :error
-del publish-netcoreapp3.0\*.xml || goto :error
+del publish-netcoreapp2.1\*.pdb publish-netcoreapp2.1\*.xml || goto :error
 
-exit /b 0
+dotnet publish -c Release -f netcoreapp3.0 -o publish-netcoreapp3.0 de4dot || goto :error
+del publish-netcoreapp3.0\*.pdb publish-netcoreapp3.0\*.xml || goto :error
 
 goto :EOF
 

diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj
@@ -28,13 +28,4 @@
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" Condition=" '$(De4DotNetFramework)' != 'true' " />
   </ItemGroup>
 
-   <ItemGroup>
-    <LicenseFiles Include="$(SolutionDir)\LICENSE.*" />
-    <LicenseFiles Include="$(SolutionDir)\COPYING" />
-  </ItemGroup>
-
-  <Target Name="CopyLicenseFiles" AfterTargets="AfterBuild">
-    <Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(TargetDir)LICENSES" />
-  </Target>
-
 </Project>
diff --git a/de4dot/de4dot.csproj b/de4dot/de4dot.csproj
@@ -12,4 +12,17 @@
     <ProjectReference Include="..\de4dot.cui\de4dot.cui.csproj" />
   </ItemGroup>
 
+   <ItemGroup>
+    <LicenseFiles Include="$(MSBuildThisFileDirectory)\..\LICENSE.*" />
+    <LicenseFiles Include="$(MSBuildThisFileDirectory)\..\COPYING" />
+  </ItemGroup>
+
+  <Target Name="CopyLicenseFiles_AfterBuild" AfterTargets="AfterBuild">
+    <Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(TargetDir)LICENSES" />
+  </Target>
+
+  <Target Name="CopyLicenseFiles_Publish" AfterTargets="Publish">
+    <Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(PublishDir)LICENSES" />
+  </Target>
+
 </Project>