build 0.12.3.0

Valkirie · Nov 3, 2022 · 60b86f6 · 60b86f6
1 parent eb0673a
commit 60b86f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/ControllerService-offline.iss b/ControllerService-offline.iss
@@ -226,10 +226,7 @@ end;
 #endif
 
 #define UseDotNet60
-#define UseDotNet60Desktop
-
 ;#define UseDotNet70
-;#define UseDotNet70Desktop
 
 #define UseVC2005
 #define UseVC2008
@@ -244,7 +241,7 @@ end;
 
 #define MyAppSetupName 'Handheld Companion'
 #define MyBuildId 'HandheldCompanion'
-#define MyAppVersion '0.12.2.1'
+#define MyAppVersion '0.12.3.0'
 #define MyAppPublisher 'BenjaminLSR'
 #define MyAppCopyright 'Copyright © BenjaminLSR'
 #define MyAppURL 'https://github.com/Valkirie/HandheldCompanion'
@@ -314,15 +311,11 @@ Source: "vcredist2019_x64.exe"; Flags: dontcopy noencryption
 
 	#ifdef UseDotNet60
 		Source: "dotnet-runtime-6.0.6-win-x64.exe"; Flags: dontcopy noencryption
-	#endif
-	#ifdef UseDotNet60Desktop
 		Source: "windowsdesktop-runtime-6.0.6-win-x64.exe"; Flags: dontcopy noencryption
 	#endif
 
 	#ifdef UseDotNet70
 		Source: "dotnet-runtime-7.0.0-rc.2.22472.3-win-x64.exe"; Flags: dontcopy noencryption
-	#endif
-	#ifdef UseDotNet70Desktop
 		Source: "windowsdesktop-runtime-7.0.0-rc.2.22472.13-win-x64.exe"; Flags: dontcopy noencryption
 	#endif
 #endif
@@ -426,15 +419,11 @@ function InitializeSetup: Boolean;
 begin
 #ifdef UseDotNet60
   ExtractTemporaryFile('dotnet-runtime-6.0.6-win-x64.exe');
-#endif
-#ifdef UseDotNet60Desktop
   ExtractTemporaryFile('windowsdesktop-runtime-6.0.6-win-x64.exe');
 #endif
 
 #ifdef UseDotNet70
   ExtractTemporaryFile('dotnet-runtime-7.0.0-rc.2.22472.3-win-x64.exe');
-#endif
-#ifdef UseDotNet70Desktop
   ExtractTemporaryFile('windowsdesktop-runtime-7.0.0-rc.2.22472.13-win-x64.exe');
 #endif
 

diff --git a/ControllerService.iss b/ControllerService.iss
@@ -387,11 +387,8 @@ end;
 ; requires netcorecheck.exe and netcorecheck_x64.exe (see download link below)
 #define UseNetCoreCheck
 #ifdef UseNetCoreCheck
-  #define UseDotNet60
-  #define UseDotNet60Desktop
-
+  #define UseDotNet60  
   ;#define UseDotNet70
-  ;#define UseDotNet70Desktop
 #endif
 
 #define UseVC2005
@@ -408,7 +405,7 @@ end;
 
 #define MyAppSetupName 'Handheld Companion'
 #define MyBuildId 'HandheldCompanion'
-#define MyAppVersion '0.12.2.1'
+#define MyAppVersion '0.12.3.0'
 #define MyAppPublisher 'BenjaminLSR'
 #define MyAppCopyright 'Copyright © BenjaminLSR'
 #define MyAppURL 'https://github.com/Valkirie/HandheldCompanion'
@@ -553,15 +550,11 @@ function InitializeSetup: Boolean;
 begin
 #ifdef UseDotNet60
   Dependency_AddDotNet60;
-#endif
-#ifdef UseDotNet60Desktop
   Dependency_AddDotNet60Desktop;
 #endif
 
 #ifdef UseDotNet70
   Dependency_AddDotNet70;
-#endif
-#ifdef UseDotNet70Desktop
   Dependency_AddDotNet70Desktop;
 #endif
 

diff --git a/ControllerService/AssemblyInfo1.cs b/ControllerService/AssemblyInfo1.cs
@@ -19,5 +19,5 @@
 //      Numéro de build
 //      Révision
 //
-[assembly: AssemblyVersion("0.12.2.1")]
-[assembly: AssemblyFileVersion("0.12.2.1")]
+[assembly: AssemblyVersion("0.12.3.0")]
+[assembly: AssemblyFileVersion("0.12.3.0")]
diff --git a/HandheldCompanion/HandheldCompanion.csproj b/HandheldCompanion/HandheldCompanion.csproj
@@ -10,7 +10,7 @@
     <StartupObject>HandheldCompanion.App</StartupObject>
     <OutputPath>$(SolutionDir)bin\$(Configuration)</OutputPath>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
-    <Version>0.12.2.1</Version>
+    <Version>0.12.3.0</Version>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>