v2.0.0-preview.1

nikeee · Oct 15, 2021 · 6b1d60a · 6b1d60a
1 parent ccda4a8
commit 6b1d60a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -28,7 +28,7 @@ jobs:
         # dotnet version --dry-run -f src/Common.props --build-meta { git rev-parse --short HEAD }
 
     - name: Compile Solution
-      run: dotnet build -c $env:CONFIGURATION
+      run: dotnet build -c $env:CONFIGURATION --self-contained
 
     - name: Run Tests
       run: dotnet test -c $env:CONFIGURATION --no-build src\HolzShots.Core.Tests\HolzShots.Core.Tests.csproj
@@ -44,10 +44,10 @@ jobs:
     - name: Collect Artifacts
       if: startsWith(github.ref, 'refs/tags/v')
       run: |
-        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\*.exe"
-        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\*.dll"
-        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\*.config"
-        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\*.manifest"
+        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\net6.0-windows\win-x64\*.exe"
+        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\net6.0-windows\win-x64\*.dll"
+        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\net6.0-windows\win-x64\*.config"
+        7z a HolzShots.zip ".\src\HolzShots\bin\$env:CONFIGURATION\net6.0-windows\win-x64\*.manifest"
         sha256sum HolzShots.zip > sha256sums.txt
 
     - uses: actions/upload-artifact@v1

diff --git a/src/Common.props b/src/Common.props
@@ -4,8 +4,9 @@
 
     <RootNamespace>HolzShots</RootNamespace>
     <TargetFramework>net6.0-windows</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
 
-    <Version>2.0.0</Version>
+    <Version>2.0.0-preview.1</Version>
 
     <Authors>Niklas Mollenhauer</Authors>
     <Copyright>Niklas Mollenhauer - AGPL-3.0</Copyright>

diff --git a/src/HolzShots.Core.Tests/HolzShots.Core.Tests.csproj b/src/HolzShots.Core.Tests/HolzShots.Core.Tests.csproj
@@ -6,7 +6,6 @@
     <RootNamespace>HolzShots.Tests</RootNamespace>
 
     <TargetFramework>net6.0-windows</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWindowsForms>true</UseWindowsForms>
 
     <IsPackable>false</IsPackable>

diff --git a/src/HolzShots.Core/UserSettings.cs b/src/HolzShots.Core/UserSettings.cs
@@ -25,12 +25,14 @@ public static async Task CreateUserSettingsIfNotPresent()
             if (File.Exists(HolzShotsPaths.UserSettingsFilePath))
                 return;
 
-            using (var fs = File.OpenWrite(HolzShotsPaths.UserSettingsFilePath))
-            {
-                var defaultSettingsStr = await CreateDefaultSettingsJson().ConfigureAwait(false);
-                var defaultSettings = Encoding.UTF8.GetBytes(defaultSettingsStr);
-                await fs.WriteAsync(defaultSettings, 0, defaultSettings.Length).ConfigureAwait(false);
-            }
+            var settingsDirectory = Path.GetDirectoryName(HolzShotsPaths.UserSettingsFilePath);
+            if(!Directory.Exists(settingsDirectory))
+                Directory.CreateDirectory(settingsDirectory!);
+
+            using var fs = File.OpenWrite(HolzShotsPaths.UserSettingsFilePath);
+            var defaultSettingsStr = await CreateDefaultSettingsJson().ConfigureAwait(false);
+            var defaultSettings = Encoding.UTF8.GetBytes(defaultSettingsStr);
+            await fs.WriteAsync(defaultSettings, 0, defaultSettings.Length).ConfigureAwait(false);
         }
 
         public static void OpenSettingsInDefaultEditor() => HolzShotsPaths.OpenFileInDefaultApplication(HolzShotsPaths.UserSettingsFilePath);