Skip to content

Commit 66f1aad

Browse files
committed
Update build/setup to use .NET 4.8 output
1 parent ee91133 commit 66f1aad

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Drums/VDrumExplorer.Setup/VDrumExplorer.Setup.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
</Target>
4444
<Target Name="BeforeBuild">
4545
<!-- Fetch the assembly version from the built file. -->
46-
<GetAssemblyIdentity AssemblyFiles="..\VDrumExplorer.Gui\bin\$(Configuration)\net472\VDrumExplorer.Gui.exe">
46+
<GetAssemblyIdentity AssemblyFiles="..\VDrumExplorer.Gui\bin\$(Configuration)\net48\VDrumExplorer.Gui.exe">
4747
<Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
4848
</GetAssemblyIdentity>
4949
<!-- Take the assembly version from the result of the above. -->
5050
<PropertyGroup>
51-
<DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePath=..\VDrumExplorer.Gui\bin\$(Configuration)\net472</DefineConstants>
51+
<DefineConstants>BuildVersion=%(AssemblyVersion.Version);BasePath=..\VDrumExplorer.Gui\bin\$(Configuration)\net48</DefineConstants>
5252
</PropertyGroup>
5353
<!-- Generate components for all files -->
54-
<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" />
54+
<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" />
5555
</Target>
5656
<Target Name="AfterBuild">
5757
</Target>

Drums/buildrelease.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
# Build executables
1818
dotnet build -c Release -v quiet VDrumExplorer.Gui
1919
# Sign executable in-place
20-
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
20+
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
2121

2222
version=$(grep \<Version\> VDrumExplorer.Gui/VDrumExplorer.Gui.csproj | sed s/\<[^\>]*\>//g | sed 's/ //g')
2323

@@ -30,7 +30,7 @@ cd tmp
3030
# Desktop
3131
release_dir=VDrumExplorer-$version
3232
mkdir $release_dir
33-
cp ../VDrumExplorer.Gui/bin/Release/net472/* $release_dir
33+
cp ../VDrumExplorer.Gui/bin/Release/net48/* $release_dir
3434
cp ../td17.vdrum $release_dir
3535
cp ../LICENSE* $release_dir
3636
cp ../README.md $release_dir

0 commit comments

Comments
 (0)