Making sure local version are matching project version (#304)

msevestre · web-flow · commit 7d3635af495c · 2025-09-14T18:03:53.000-04:00
diff --git a/src/InstallationValidator.Core/InstallationValidator.Core.csproj b/src/InstallationValidator.Core/InstallationValidator.Core.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <Version>12.0.0</Version>
-    <PackageVersion>12.0.0</PackageVersion>
-    <AssemblyVersion>12.0.0</AssemblyVersion>
-    <FileVersion>12.0.0</FileVersion>
-    <InformationalVersion>12.0.0</InformationalVersion>
+    <Version>12.1.0</Version>
+    <PackageVersion>12.1.0</PackageVersion>
+    <AssemblyVersion>12.1.0</AssemblyVersion>
+    <FileVersion>12.1.0</FileVersion>
+    <InformationalVersion>12.1.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <PackageTags>open-systems-pharmacology, ospsuite-components</PackageTags>
diff --git a/src/InstallationValidator.Core/InstallationValidatorConfiguration.cs b/src/InstallationValidator.Core/InstallationValidatorConfiguration.cs
@@ -5,6 +5,8 @@
 using OSPSuite.Assets;
 using OSPSuite.Core;
 using OSPSuite.Core.Domain;
+using static InstallationValidator.Core.Constants.Tools;
+using static OSPSuite.Core.Domain.Constants.RegistryPaths;
 
 namespace InstallationValidator.Core
 {
@@ -38,17 +40,17 @@ public InstallationValidatorConfiguration() : base(Assembly.GetExecutingAssembly
       public override string WatermarkOptionLocation { get; } = "Options -> Settings -> Application";
       public override string ApplicationFolderPathName { get; } = Constants.APPLICATION_FOLDER_PATH;
 
-      public string PKSimBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.PKSIM_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_PATH);
+      public string PKSimBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(PKSIM_REG_PATH, INSTALL_PATH);
 
-      public string MoBiBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.MOBI_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_PATH);
+      public string MoBiBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(MOBI_REG_PATH, INSTALL_PATH);
 
-      public string PKSimInstallFolderPath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.PKSIM_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_DIR);
+      public string PKSimInstallFolderPath => getRegistryValueForRegistryPathAndKey(PKSIM_REG_PATH, INSTALL_DIR);
 
-      public string BatchInputsFolderPath => AllUsersFile(Constants.Tools.BATCH_INPUTS);
+      public string BatchInputsFolderPath => AllUsersFile(BATCH_INPUTS);
 
-      public string BatchOutputsFolderPath => AllUsersFile(Constants.Tools.BATCH_OUTPUTS);
+      public string BatchOutputsFolderPath => AllUsersFile(BATCH_OUTPUTS);
 
-      public string PKSimCLIPath => Path.Combine(PKSimInstallFolderPath, Constants.Tools.PKSIM_CLI);
+      public string PKSimCLIPath => Path.Combine(PKSimInstallFolderPath, PKSIM_CLI);
 
       private string getRegistryValueForRegistryPathAndKey(string openSystemsPharmacology, string installDir)
       {
@@ -62,6 +64,6 @@ private string getRegistryValueForRegistryPathAndKey(string openSystemsPharmacol
          }
       }
 
-      public string DefaultOutputPath => Path.Combine(CurrentUserFolderPath, Constants.Tools.CALCULATION_OUTPUTS);
+      public string DefaultOutputPath => Path.Combine(CurrentUserFolderPath, CALCULATION_OUTPUTS);
    }
 }
diff --git a/src/InstallationValidator/InstallationValidator.csproj b/src/InstallationValidator/InstallationValidator.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <Version>12.0.0</Version>
-    <PackageVersion>12.0.0</PackageVersion>
-    <AssemblyVersion>12.0.0</AssemblyVersion>
-    <FileVersion>12.0.0</FileVersion>
-    <InformationalVersion>12.0.0</InformationalVersion>
+    <Version>12.1.0</Version>
+    <PackageVersion>12.1.0</PackageVersion>
+    <AssemblyVersion>12.1.0</AssemblyVersion>
+    <FileVersion>12.1.0</FileVersion>
+    <InformationalVersion>12.1.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <Authors>Open-Systems-Pharmacology</Authors>
diff --git a/src/SimulationOutputComparer/SimulationOutputComparer.csproj b/src/SimulationOutputComparer/SimulationOutputComparer.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <Version>12.0.0</Version>
-    <PackageVersion>12.0.0</PackageVersion>
-    <AssemblyVersion>12.0.0</AssemblyVersion>
-    <FileVersion>12.0.0</FileVersion>
-    <InformationalVersion>12.0.0</InformationalVersion>
+    <Version>12.1.0</Version>
+    <PackageVersion>12.1.0</PackageVersion>
+    <AssemblyVersion>12.1.0</AssemblyVersion>
+    <FileVersion>12.1.0</FileVersion>
+    <InformationalVersion>12.1.0</InformationalVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <Authors>Open-Systems-Pharmacology</Authors>

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`using OSPSuite.Assets;`
`6`	`6`	`using OSPSuite.Core;`
`7`	`7`	`using OSPSuite.Core.Domain;`
	`8`	`+using static InstallationValidator.Core.Constants.Tools;`
	`9`	`+using static OSPSuite.Core.Domain.Constants.RegistryPaths;`
`8`	`10`
`9`	`11`	`namespace InstallationValidator.Core`
`10`	`12`	`{`
`@@ -38,17 +40,17 @@ public InstallationValidatorConfiguration() : base(Assembly.GetExecutingAssembly`
`38`	`40`	`public override string WatermarkOptionLocation { get; } = "Options -> Settings -> Application";`
`39`	`41`	`public override string ApplicationFolderPathName { get; } = Constants.APPLICATION_FOLDER_PATH;`
`40`	`42`
`41`		`- public string PKSimBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.PKSIM_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_PATH);`
	`43`	`+ public string PKSimBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(PKSIM_REG_PATH, INSTALL_PATH);`
`42`	`44`
`43`		`- public string MoBiBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.MOBI_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_PATH);`
	`45`	`+ public string MoBiBinaryExecutablePath => getRegistryValueForRegistryPathAndKey(MOBI_REG_PATH, INSTALL_PATH);`
`44`	`46`
`45`		`- public string PKSimInstallFolderPath => getRegistryValueForRegistryPathAndKey(OSPSuite.Core.Domain.Constants.RegistryPaths.PKSIM_REG_PATH, OSPSuite.Core.Domain.Constants.RegistryPaths.INSTALL_DIR);`
	`47`	`+ public string PKSimInstallFolderPath => getRegistryValueForRegistryPathAndKey(PKSIM_REG_PATH, INSTALL_DIR);`
`46`	`48`
`47`		`- public string BatchInputsFolderPath => AllUsersFile(Constants.Tools.BATCH_INPUTS);`
	`49`	`+ public string BatchInputsFolderPath => AllUsersFile(BATCH_INPUTS);`
`48`	`50`
`49`		`- public string BatchOutputsFolderPath => AllUsersFile(Constants.Tools.BATCH_OUTPUTS);`
	`51`	`+ public string BatchOutputsFolderPath => AllUsersFile(BATCH_OUTPUTS);`
`50`	`52`
`51`		`- public string PKSimCLIPath => Path.Combine(PKSimInstallFolderPath, Constants.Tools.PKSIM_CLI);`
	`53`	`+ public string PKSimCLIPath => Path.Combine(PKSimInstallFolderPath, PKSIM_CLI);`
`52`	`54`
`53`	`55`	`private string getRegistryValueForRegistryPathAndKey(string openSystemsPharmacology, string installDir)`
`54`	`56`	`{`
`@@ -62,6 +64,6 @@ private string getRegistryValueForRegistryPathAndKey(string openSystemsPharmacol`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`
`65`		`- public string DefaultOutputPath => Path.Combine(CurrentUserFolderPath, Constants.Tools.CALCULATION_OUTPUTS);`
	`67`	`+ public string DefaultOutputPath => Path.Combine(CurrentUserFolderPath, CALCULATION_OUTPUTS);`
`66`	`68`	`}`
`67`	`69`	`}`