Update build/setup to use .NET 4.8 output

jskeet · Jan 9, 2023 · 66f1aad · 66f1aad
1 parent ee91133
commit 66f1aad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Drums/VDrumExplorer.Setup/VDrumExplorer.Setup.wixproj b/Drums/VDrumExplorer.Setup/VDrumExplorer.Setup.wixproj
@@ -43,15 +43,15 @@
   </Target>
   <Target Name="BeforeBuild">
     <!-- Fetch the assembly version from the built file. -->
-    <GetAssemblyIdentity AssemblyFiles="..\VDrumExplorer.Gui\bin\$(Configuration)\net472\VDrumExplorer.Gui.exe">
+    <GetAssemblyIdentity AssemblyFiles="..\VDrumExplorer.Gui\bin\$(Configuration)\net48\VDrumExplorer.Gui.exe">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
     </GetAssemblyIdentity>
     <!-- Take the assembly version from the result of the above. -->
     <PropertyGroup>
-      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePath=..\VDrumExplorer.Gui\bin\$(Configuration)\net472</DefineConstants>
+      <DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePath=..\VDrumExplorer.Gui\bin\$(Configuration)\net48</DefineConstants>
     </PropertyGroup>
     <!-- Generate components for all files -->
-    <HeatDirectory OutputFile="ComponentsGenerated.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="PublishedComponents" SuppressCom="true" Directory="..\VDrumExplorer.Gui\bin\$(Configuration)\net472" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" />
+    <HeatDirectory OutputFile="ComponentsGenerated.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="PublishedComponents" SuppressCom="true" Directory="..\VDrumExplorer.Gui\bin\$(Configuration)\net48" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" />
   </Target>
   <Target Name="AfterBuild">
   </Target>

diff --git a/Drums/buildrelease.sh b/Drums/buildrelease.sh
@@ -17,7 +17,7 @@ fi
 # Build executables
 dotnet build -c Release -v quiet VDrumExplorer.Gui
 # Sign executable in-place
-signtool sign -a -fd SHA256 -f $PFX_PATH -p $PFX_PASSWORD -t http://timestamp.comodoca.com/authenticode VDrumExplorer.Gui/bin/Release/net472/VDrumExplorer.Gui.exe
+signtool sign -a -fd SHA256 -f $PFX_PATH -p $PFX_PASSWORD -t http://timestamp.comodoca.com/authenticode VDrumExplorer.Gui/bin/Release/net48/VDrumExplorer.Gui.exe
 
 version=$(grep \<Version\> VDrumExplorer.Gui/VDrumExplorer.Gui.csproj | sed s/\<[^\>]*\>//g | sed 's/ //g')
 
@@ -30,7 +30,7 @@ cd tmp
 # Desktop
 release_dir=VDrumExplorer-$version
 mkdir $release_dir
-cp ../VDrumExplorer.Gui/bin/Release/net472/* $release_dir
+cp ../VDrumExplorer.Gui/bin/Release/net48/* $release_dir
 cp ../td17.vdrum $release_dir
 cp ../LICENSE* $release_dir
 cp ../README.md $release_dir