summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/CS/HandBrake.Interop/HandBrake.Interop.csproj2
-rw-r--r--win/CS/HandBrake.Interop/app.config2
-rw-r--r--win/CS/HandBrake.Worker/App.config6
-rw-r--r--win/CS/HandBrake.Worker/HandBrake.Worker.csproj3
-rw-r--r--win/CS/HandBrakeTools/App.config6
-rw-r--r--win/CS/HandBrakeTools/HandBrakeTools.csproj3
-rw-r--r--win/CS/HandBrakeWPF/HandBrakeWPF.csproj2
-rw-r--r--win/CS/HandBrakeWPF/Installer/Installer64.nsi6
-rw-r--r--win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi6
-rw-r--r--win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs2
-rw-r--r--win/CS/HandBrakeWPF/app.config2
11 files changed, 21 insertions, 19 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index 733c81248..651ebf634 100644
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandBrake.Interop</RootNamespace>
<AssemblyName>HandBrake.Interop</AssemblyName>
- <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
diff --git a/win/CS/HandBrake.Interop/app.config b/win/CS/HandBrake.Interop/app.config
index 4a29a96b3..462e7462f 100644
--- a/win/CS/HandBrake.Interop/app.config
+++ b/win/CS/HandBrake.Interop/app.config
@@ -3,6 +3,6 @@
<configSections>
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
diff --git a/win/CS/HandBrake.Worker/App.config b/win/CS/HandBrake.Worker/App.config
index 787dcbecc..4bfa00561 100644
--- a/win/CS/HandBrake.Worker/App.config
+++ b/win/CS/HandBrake.Worker/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
-</configuration> \ No newline at end of file
+</configuration>
diff --git a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
index 506e37245..38d794a5a 100644
--- a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
+++ b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj
@@ -8,9 +8,10 @@
<OutputType>Exe</OutputType>
<RootNamespace>HandBrake.Worker</RootNamespace>
<AssemblyName>HandBrake.Worker</AssemblyName>
- <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
diff --git a/win/CS/HandBrakeTools/App.config b/win/CS/HandBrakeTools/App.config
index 731f6de6c..4bfa00561 100644
--- a/win/CS/HandBrakeTools/App.config
+++ b/win/CS/HandBrakeTools/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
-</configuration> \ No newline at end of file
+</configuration>
diff --git a/win/CS/HandBrakeTools/HandBrakeTools.csproj b/win/CS/HandBrakeTools/HandBrakeTools.csproj
index f8eac8fd9..34eb016b5 100644
--- a/win/CS/HandBrakeTools/HandBrakeTools.csproj
+++ b/win/CS/HandBrakeTools/HandBrakeTools.csproj
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandBrakeTools</RootNamespace>
<AssemblyName>HandBrakeTools</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<PublishUrl>publish\</PublishUrl>
@@ -27,6 +27,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index aa1725a10..1c1fbc871 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HandBrakeWPF</RootNamespace>
<AssemblyName>HandBrake</AssemblyName>
- <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 386244d4f..e17eccac7 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -127,18 +127,18 @@ Section "HandBrake" SEC01
Call CheckFramework
StrCmp $0 "1" +3
StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.7.1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+ MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.8 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
Pop $0
; Get .NET if required
${If} $InstallDotNET == "Yes"
SetDetailsView hide
- inetc::get /caption "Downloading Microsoft .NET Framework 4.7.1" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end
+ inetc::get /caption "Downloading Microsoft .NET Framework 4.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end
Pop $1
${If} $1 != "OK"
Delete "$INSTDIR\dotnetfx.exe"
- Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework"
+ Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework"
${EndIf}
ExecWait "$INSTDIR\dotnetfx.exe"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index a76dc0000..f471ee0a3 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -126,18 +126,18 @@ Section "HandBrake" SEC01
Call CheckFramework
StrCmp $0 "1" +3
StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.7.1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+ MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.8 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
Pop $0
; Get .NET if required
${If} $InstallDotNET == "Yes"
SetDetailsView hide
- inetc::get /caption "Downloading Microsoft .NET Framework 4.7.1" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end
+ inetc::get /caption "Downloading Microsoft .NET Framework 4.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end
Pop $1
${If} $1 != "OK"
Delete "$INSTDIR\dotnetfx.exe"
- Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework"
+ Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework"
${EndIf}
ExecWait "$INSTDIR\dotnetfx.exe"
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index 438ccc251..cf331974e 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class ResourcesTooltips {
diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config
index e23d0c02d..a2962a879 100644
--- a/win/CS/HandBrakeWPF/app.config
+++ b/win/CS/HandBrakeWPF/app.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<runtime>
<!-- Required for "Per monitor DPI scaling" on .NET < 4.6.2 -->
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 11:49:12 +0000