- only pack the main/develop branch

- ensure ResolvePluginReferences is called before CoreCompile and after default Restore
Cryptoc1 · Jan 4, 2024 · 98b5107 · 98b5107
1 parent 29f132f
commit 98b5107
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -51,7 +51,8 @@ jobs:
         run: dotnet build test/LethalCompany.SdkSample.csproj --no-restore
 
   pack:
-    needs: [build]
+    if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/develop')
+
     runs-on: windows-latest
     steps:
       - name: checkout
@@ -80,7 +81,6 @@ jobs:
           path: .sdk
 
   publish:
-    if: startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/develop')
     needs: [pack]
 
     runs-on: windows-latest

diff --git a/src/Sdk/Sdk.targets b/src/Sdk/Sdk.targets
@@ -99,7 +99,7 @@
   <!-- 
     Executes the `ResolvePluginAssemblies` task to resolve the reference assemblies of `ThunderDependency` items.
    -->
-  <Target Name="ResolvePluginReferences" AfterTargets="RestorePlugins" DependsOnTargets="ResolveProjectReferences">
+  <Target Name="ResolvePluginReferences" BeforeTargets="CoreCompile" AfterTargets="RestorePlugins;Restore" DependsOnTargets="ResolveProjectReferences">
     <ResolvePluginAssemblies AssetsFile="$(PluginAssetsFile)">
       <Output ItemName="_PluginReference" TaskParameter="ResolvedAssemblies" />
     </ResolvePluginAssemblies>