Fix Installer, update to 1.0.2

Apollo199999999 · Jun 17, 2021 · b890f5b · b890f5b
1 parent 5dee6d1
commit b890f5b
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 24 deletions.
diff --git a/.vs/DynaWin/v16/.suo b/.vs/DynaWin/v16/.suo
diff --git a/DynaWin/Properties/AssemblyInfo.cs b/DynaWin/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1")]
-[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.2")]
+[assembly: AssemblyFileVersion("1.0.2")]
diff --git a/DynaWin/PublicVariables.cs b/DynaWin/PublicVariables.cs
@@ -44,7 +44,7 @@ static class PublicVariables
         public static string StarupFolder = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
 
         //this variable stores the current version of DynaWin
-        public static string DynaWinCurrentVersion = "1.0.1";
+        public static string DynaWinCurrentVersion = "1.0.2";
 
         //function to see if a second task with the same name exists
         public static bool CheckifTaskNameExists(string targetDirectory, string TaskName)

diff --git a/DynaWin/bin/Debug/DynaWin.exe b/DynaWin/bin/Debug/DynaWin.exe
diff --git a/DynaWin/bin/Debug/DynaWin.pdb b/DynaWin/bin/Debug/DynaWin.pdb
diff --git a/DynaWin/obj/Debug/AddDynamicThemeTask.baml b/DynaWin/obj/Debug/AddDynamicThemeTask.baml
diff --git a/DynaWin/obj/Debug/AddDynamicWallpaperTask.baml b/DynaWin/obj/Debug/AddDynamicWallpaperTask.baml
diff --git a/DynaWin/obj/Debug/App.baml b/DynaWin/obj/Debug/App.baml
diff --git a/DynaWin/obj/Debug/DynaWin.Properties.Resources.resources b/DynaWin/obj/Debug/DynaWin.Properties.Resources.resources
diff --git a/DynaWin/obj/Debug/DynaWin.csproj.GenerateResource.cache b/DynaWin/obj/Debug/DynaWin.csproj.GenerateResource.cache
diff --git a/DynaWin/obj/Debug/DynaWin.csprojAssemblyReference.cache b/DynaWin/obj/Debug/DynaWin.csprojAssemblyReference.cache
diff --git a/DynaWin/obj/Debug/DynaWin.exe b/DynaWin/obj/Debug/DynaWin.exe
diff --git a/DynaWin/obj/Debug/DynaWin.g.resources b/DynaWin/obj/Debug/DynaWin.g.resources
diff --git a/DynaWin/obj/Debug/DynaWin.pdb b/DynaWin/obj/Debug/DynaWin.pdb
diff --git a/DynaWin/obj/Debug/DynaWin_MarkupCompile.i.cache b/DynaWin/obj/Debug/DynaWin_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ C:\Users\fligh\source\repos\DynaWin\DynaWin\App.xaml
 213-1122049833
 AddDynamicThemeTask.xaml;AddDynamicWallpaperTask.xaml;MainWindow.xaml;PreferencesWindow.xaml;SettingsWindow.xaml;TimePicker.xaml;
 
-True
+False
 
diff --git a/DynaWin/obj/Debug/DynaWin_MarkupCompile.i.lref b/DynaWin/obj/Debug/DynaWin_MarkupCompile.i.lref
diff --git a/DynaWin/obj/Debug/MainWindow.baml b/DynaWin/obj/Debug/MainWindow.baml
diff --git a/DynaWin/obj/Debug/PreferencesWindow.baml b/DynaWin/obj/Debug/PreferencesWindow.baml
diff --git a/DynaWin/obj/Debug/SettingsWindow.baml b/DynaWin/obj/Debug/SettingsWindow.baml
diff --git a/DynaWin/obj/Debug/TimePicker.baml b/DynaWin/obj/Debug/TimePicker.baml
diff --git a/DynaWin/obj/DynaWin.csproj.nuget.dgspec.json b/DynaWin/obj/DynaWin.csproj.nuget.dgspec.json
@@ -14,8 +14,12 @@
         "outputPath": "C:\\Users\\fligh\\source\\repos\\DynaWin\\DynaWin\\obj\\",
         "projectStyle": "PackageReference",
         "skipContentFileWrite": true,
+        "fallbackFolders": [
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\fligh\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [

diff --git a/DynaWin/obj/DynaWin.csproj.nuget.g.props b/DynaWin/obj/DynaWin.csproj.nuget.g.props
@@ -5,12 +5,13 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\fligh\.nuget\packages\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\fligh\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.8.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.9.1</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
+    <SourceRoot Include="C:\Users\fligh\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

diff --git a/DynaWin/obj/project.assets.json b/DynaWin/obj/project.assets.json
@@ -1250,7 +1250,8 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\fligh\\.nuget\\packages\\": {}
+    "C:\\Users\\fligh\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
@@ -1262,8 +1263,12 @@
       "outputPath": "C:\\Users\\fligh\\source\\repos\\DynaWin\\DynaWin\\obj\\",
       "projectStyle": "PackageReference",
       "skipContentFileWrite": true,
+      "fallbackFolders": [
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+      ],
       "configFilePaths": [
         "C:\\Users\\fligh\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [

diff --git a/DynaWin/obj/project.nuget.cache b/DynaWin/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "G+iM80ccgZt4uqz8h2DadG6yYnYI6i6u7mX7LoNlKQQba5sEBcCkBDK7dOtJW2SDoBYY1MRWmPbl27+WIwPq2g==",
+  "dgSpecHash": "9Xy/oQKgeTXbm0cFksYKmyDXR7VQ8i0QvH127lG2qLKHEIgAWnzXdkpqNfP0m8J1ShgeIKsPGDlMzfpInXQZiQ==",
   "success": true,
   "projectFilePath": "C:\\Users\\fligh\\source\\repos\\DynaWin\\DynaWin\\DynaWin.csproj",
   "expectedPackageFiles": [

diff --git a/DynaWin_1.0.2_Setup.exe b/DynaWin_1.0.2_Setup.exe
diff --git a/Setup.iss b/Setup.iss
@@ -1,35 +1,37 @@
-; Script generated by the Inno Setup Script Wizard.
+
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "DynaWin"
-#define MyAppVersion "1.0.1"
+#define MyAppVersion "1.0.2"
 #define MyAppPublisher "ClickPhase"
 #define MyAppURL "https://clickphase.weebly.com/dynawin.html"
 #define MyAppExeName "DynaWin.exe"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{42F8A7FC-7816-44A3-ACCE-2E65EA8BBA0B}
+AppId={{EC36A1B5-7473-4F76-9D82-61DB6249B906}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 ;AppVerName={#MyAppName} {#MyAppVersion}
+DisableWelcomePage=no
+DisableDirPage=no
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={autopf}\{#MyAppName}
+DefaultDirName=C:\Program Files (x86)\DynaWin
 DisableProgramGroupPage=yes
 LicenseFile=C:\Users\fligh\source\repos\DynaWin\LICENSE.txt
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
 OutputDir=C:\Users\fligh\source\repos\DynaWin
-OutputBaseFilename=DynaWin_1.0.1_Setup
+OutputBaseFilename=DynaWin_1.0.2_Setup
 SetupIconFile=C:\Users\fligh\source\repos\DynaWin\DynaWin\bin\Debug\Resources\icon.ico
 Compression=lzma
 SolidCompression=yes
 WizardStyle=modern
-VersionInfoVersion = 1.0.1
+VersionInfoVersion = 1.0.2
 UninstallDisplayIcon={app}\DynaWin.exe
 UninstallDisplayName=DynaWin
 

diff --git a/DynaWin_1.0.1_Setup.exe → setup.old/DynaWin_1.0.1_Setup.exe b/DynaWin_1.0.1_Setup.exe → setup.old/DynaWin_1.0.1_Setup.exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,5 +16,5 @@ C:\Users\fligh\source\repos\DynaWin\DynaWin\App.xaml @@
 -1122049833
     AddDynamicThemeTask.xaml;AddDynamicWallpaperTask.xaml;MainWindow.xaml;PreferencesWindow.xaml;SettingsWindow.xaml;TimePicker.xaml;
-    True
+    False