build: update workflow

navigatorframework · Oct 9, 2023 · b609be6 · b609be6
1 parent d5713a5
commit b609be6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/package.navigator.yml b/.github/workflows/package.navigator.yml
@@ -14,17 +14,13 @@ env:
   PROJECT_NAME: Navigator
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
+    runs-on: ubuntu-latest
     steps:
+
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
+        uses: actions/setup-dotnet@v3
       - name: Restore
         working-directory: ./src
         run: dotnet restore
@@ -35,7 +31,6 @@ jobs:
         working-directory: ./src
         run: dotnet test -c Release
       - name: Pack
-        if: matrix.os == 'ubuntu-latest'
         run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/$PROJECT_NAME.sln
       # - name: Upload Artifact
       #   if: matrix.os == 'ubuntu-latest'
@@ -59,10 +54,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-      - name: Create Release NuGet package
+        uses: actions/setup-dotnet@v3
+      - name: Create release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })
           VERSION="${arrTag[2]}"

diff --git a/src/Navigator.sln b/src/Navigator.sln
@@ -13,6 +13,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Testing", "Sample.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Store", "Sample.Store\Sample.Store.csproj", "{05843F22-918E-43BB-B6E9-BE112A6B180F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution-items", ".solution-items", "{731D9036-DAE1-4300-825D-37C6F25C4F60}"
+	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\package.navigator.yml = ..\.github\workflows\package.navigator.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Sample.Store/Sample.Store.csproj b/src/Sample.Store/Sample.Store.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/global.json b/src/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "rollForward": "feature",
+    "version": "7.0.111"
+  }
+}