.NET 4.8

b23prodtm · Apr 3, 2023 · e917c84 · e917c84
1 parent c5c7bc6
commit e917c84
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 109 deletions.
diff --git a/BuildAll.bat b/BuildAll.bat
@@ -1,13 +1,13 @@
 echo off
-SET VS=14.0
+SET VS=Microsoft Visual Studio\2022\Community
 SET SLN_CFG=Release
-SET BUILDER=%ProgramFiles(x86)%\MSBuild\%VS%\Bin\MSBuild.exe
-SET InnoCompiler=%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe
+SET BUILDER=%ProgramFiles%\%VS%\MSBuild\Current\Bin\MSBuild.exe
+SET InnoCompiler=%ProgramFiles(x86)%\Inno Setup 6\ISCC.exe
 
 
 :build32
 echo %DATE% %TIME%: Cleaning MFIGamepadFeeder (x86) 
-"%BUILDER%"  MFIGamepadFeeder.sln  /maxcpucount:1 /t:clean /p:Platform=x86;Configuration="%SLN_CFG%"
+"%BUILDER%" MFIGamepadFeeder.sln  /maxcpucount:1 /t:clean /p:Platform=x86;Configuration="%SLN_CFG%"
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
 

diff --git a/MFIGamepadConfigCreator/App.config b/MFIGamepadConfigCreator/App.config
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/MFIGamepadConfigCreator/MFIGamepadConfigCreator.csproj b/MFIGamepadConfigCreator/MFIGamepadConfigCreator.csproj
@@ -9,11 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MFIGamepadConfigCreator</RootNamespace>
     <AssemblyName>MFIGamepadConfigCreator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28Local%29|x64'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/MFIGamepadConfigCreator/Properties/Resources.Designer.cs b/MFIGamepadConfigCreator/Properties/Resources.Designer.cs
diff --git a/MFIGamepadConfigCreator/Properties/Settings.Designer.cs b/MFIGamepadConfigCreator/Properties/Settings.Designer.cs
diff --git a/MFIGamepadFeeder/App.config b/MFIGamepadFeeder/App.config
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="MFIGamepadFeeder.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="MFIGamepadFeeder.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
     <userSettings>
         <MFIGamepadFeeder.Properties.Settings>
             <setting name="SelectedHidDevice1" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedControllerId1" serializeAs="String">
                 <value>1</value>
             </setting>
             <setting name="SelectedConfigFile1" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedHidDevice2" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedHidDevice3" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedHidDevice4" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedControllerId2" serializeAs="String">
                 <value>2</value>
@@ -38,13 +38,13 @@
                 <value>4</value>
             </setting>
             <setting name="SelectedConfigFile2" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedConfigFile3" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SelectedConfigFile4" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="ControllerActive1" serializeAs="String">
                 <value>False</value>
@@ -69,9 +69,9 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/MFIGamepadFeeder/MFIGamepadFeeder.csproj b/MFIGamepadFeeder/MFIGamepadFeeder.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MFIGamepadFeeder</RootNamespace>
     <AssemblyName>MFIGamepadFeeder</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -31,6 +31,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -305,4 +306,4 @@ rd /q /s "$(TargetDir)vGenSDK"</PostBuildEvent>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/MFIGamepadFeeder/Properties/Resources.Designer.cs b/MFIGamepadFeeder/Properties/Resources.Designer.cs
diff --git a/MFIGamepadFeeder/Properties/Settings.Designer.cs b/MFIGamepadFeeder/Properties/Settings.Designer.cs
diff --git a/MFIGamepadShared/MFIGamepadShared.csproj b/MFIGamepadShared/MFIGamepadShared.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MFIGamepadShared</RootNamespace>
     <AssemblyName>MFIGamepadShared</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/MFIGamepadShared/app.config b/MFIGamepadShared/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0" />
+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="94bc3704cddfc263" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1000.0" newVersion="3.0.1000.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>