diff options
| author | sr55 <[email protected]> | 2020-11-12 18:35:32 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2020-11-12 18:35:32 +0000 |
| commit | ee480a305ef996bc1b2f107271fd555d5eccbdbd (patch) | |
| tree | 881c9ada298d94a747b912b7b606bcddb8cc4765 /win/CS/HandBrakeWPF | |
| parent | 3b5dc0e57a64d2eed7fe05d9fa35e8de8b6a75f3 (diff) | |
WinGui: Some re-work in the msbuild file and installers to support .NET 5 correctly and some warnings fixed.
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 11 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/Installer64.nsi | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 2 |
3 files changed, 1 insertions, 14 deletions
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 516d90706..3627e921a 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
@@ -22,7 +22,6 @@ <AssemblyName>HandBrake</AssemblyName>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
- <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -59,14 +58,6 @@ </ItemGroup>
<ItemGroup>
- <Reference Include="PresentationFramework.Aero" />
- <Reference Include="System.Management" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Windows" />
- <Reference Include="System.Windows.Forms" />
- </ItemGroup>
-
- <ItemGroup>
<Resource Include="handbrakepineapple.ico" />
<Resource Include="Views\Images\close64.png" />
<Resource Include="Views\Images\close64_dark.png" />
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 5f655e88f..ec6914ec9 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -64,8 +64,6 @@ InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show
ShowUnInstDetails show
-Var InstallDotNET
-
Function .onInit
; For Silent Installs, Assume All Users
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index 1b4076095..19323a403 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -63,8 +63,6 @@ InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show
ShowUnInstDetails show
-Var InstallDotNET
-
Function .onInit
IfSilent 0 +2
|