Merge branch 'main' into dev

Mutagen-Modding · Dec 23, 2024 · cde4542 · cde4542
2 parents 4a163da + f772d35
commit cde4542
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
@@ -119,14 +119,9 @@ jobs:
         dotnet restore Spriggit.sln
     - name: Build
       run: dotnet build Spriggit.sln -c Release --no-restore /p:GeneratePackageOnBuild=false
-    - name: Pack Preview
-      if: ${{ success() && (github.event.release.prerelease || github.event_name != 'release') }}
+    - name: Pack
       run: |
-        dotnet pack Spriggit.sln -c Release -o out --include-symbols
-    - name: Pack Release
-      if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
-      run: | 
-        dotnet pack Spriggit.sln -c Release -o out --include-symbols
+        dotnet pack Spriggit.sln -c Release --no-build --no-restore -o out --include-symbols -p:SymbolPackageFormat=snupkg
     - name: Pack GUI
       if: ${{ success() && !github.event.release.prerelease && github.event_name == 'release' }}
       run: dotnet publish "Spriggit.UI/Spriggit.UI.csproj" --configuration Release -p:PublishSingleFile=true 
@@ -169,8 +164,11 @@ jobs:
         file: SpriggitCLI.zip
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.event.release.tag_name }}
+    - name: Print Packages
+      run: |
+        ls out/*.nupkg
     - name: Publish to Nuget.org
-      run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
+      run: dotnet nuget push out/**/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
 
   update-nightly:
     needs: [build-test-push, activity-short-circuit]

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,28 +11,28 @@
     </PackageVersion>
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageVersion Include="Mutagen.Bethesda">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Core">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Kernel">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Skyrim">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Oblivion">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Fallout4">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Starfield">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Testing">
-      <Version>[0.49.0-alpha.34]</Version>
+      <Version>[0.49.0-alpha.50]</Version>
     </PackageVersion>
     <PackageVersion Include="Mutagen.Bethesda.Serialization">
       <Version>[1.30.0]</Version>
@@ -48,23 +48,23 @@
     </PackageVersion>
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Noggog.Autofac">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.CSharpExt">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.CSharpExt.Windows">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.GitRepository" Version="1.5.0" />
     <PackageVersion Include="Noggog.Testing">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.WPF">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="Noggog.SourceGenerators">
-      <Version>[2.70.0-alpha.12]</Version>
+      <Version>[2.70.0-alpha.15]</Version>
     </PackageVersion>
     <PackageVersion Include="NuGet.Build.Tasks">
       <Version>6.12.1</Version>

diff --git a/Spriggit.Engine/Spriggit.Engine.csproj b/Spriggit.Engine/Spriggit.Engine.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Spriggit.Core\Spriggit.Core.csproj"/>

diff --git a/Spriggit.UI/ViewModels/Transient/LinkInputVm.cs b/Spriggit.UI/ViewModels/Transient/LinkInputVm.cs
@@ -37,6 +37,7 @@ public class LinkInputVm : ViewModel
     {
         PathType = PathPickerVM.PathTypeOptions.Folder,
         ExistCheckOption = PathPickerVM.CheckOptions.Off,
+        MissingIsError = false,
     };
 
     public PathPickerVM DataFolderPicker { get; } = new()

diff --git a/Spriggit.UI/ViewModels/Transient/LinkVm.cs b/Spriggit.UI/ViewModels/Transient/LinkVm.cs
@@ -126,11 +126,7 @@ public LinkVm(
 
         SyncToModCommand = ReactiveCommand.Create<Unit>(
             execute: _ => { },
-            Observable.CombineLatest(
-                canRun,
-                Input.GitFolderPicker.WhenAnyValue(x => x.Exists),
-                (r, e) => r && e)
-                .ObserveOnGui());
+            canRun.ObserveOnGui());
         CancelSyncToModCommand = ReactiveCommand.Create(
             () => { },
             canExecute: this.WhenAnyValue(x => x.State).Select(x => x == SyncState.Mod)