test 1

asv-soft · Oct 21, 2024 · 74c8c27 · 74c8c27
1 parent bb40d93
commit 74c8c27
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 39 deletions.
diff --git a/.github/workflows/release-action.yml b/.github/workflows/release-action.yml
@@ -17,7 +17,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4

diff --git a/.github/workflows/release-debug-version.yml b/.github/workflows/release-debug-version.yml
@@ -17,7 +17,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
@@ -31,10 +31,14 @@ jobs:
         run: dotnet nuget add source ${{ env.GITHUB_PACKAGES_URL }} \--username '${{secrets.USER_NAME}}' \--password '${{secrets.GIHUB_NUGET_AUTH_TOKEN}}' \--store-password-in-clear-text
 
       - name: Install dependencies
-        run: dotnet restore ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj
+        run: |
+          dotnet restore ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj
+          dotnet restore ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj
 
       - name: Build
-        run: dotnet build ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj --configuration Release --no-restore
+        run: |
+          dotnet build ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj --configuration Release --no-restore
+          dotnet build ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj --configuration Release --no-restore
 
       - name: Set version variable
         env:
@@ -53,13 +57,14 @@ jobs:
             echo "Error: Tag does not match NuGet package version"
             exit 1
           fi
-          
+
       - name: Tests
-        run: |
-          dotnet test ./src/${{env.PROJECT_NAME}}.Tests/${{env.PROJECT_NAME}}.Tests.csproj
+        run: dotnet test ./src/${{env.PROJECT_NAME}}.Tests/${{env.PROJECT_NAME}}.Tests.csproj
 
-      - name: Pack package
-        run: dotnet pack ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj -c Release /p:Version=${{ env.VERSION }} --no-build -o .
+      - name: Pack packages
+        run: |
+          dotnet pack ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj -c Release /p:Version=${VERSION} --no-build -o .
+          dotnet pack ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj -c Release /p:Version=${VERSION} --no-build -o .
 
       - name: List output files
         run: ls -la

diff --git a/.github/workflows/release-pre-version.yml b/.github/workflows/release-pre-version.yml
@@ -18,7 +18,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
@@ -32,10 +32,14 @@ jobs:
         run: dotnet nuget add source ${{ env.GITHUB_PACKAGES_URL }} \--username '${{secrets.USER_NAME}}' \--password '${{secrets.GIHUB_NUGET_AUTH_TOKEN}}' \--store-password-in-clear-text
 
       - name: Install dependencies
-        run: dotnet restore ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj
+        run: |
+          dotnet restore ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj
+          dotnet restore ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj
 
       - name: Build
-        run: dotnet build ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj --configuration Release --no-restore
+        run: |
+          dotnet build ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj --configuration Release --no-restore
+          dotnet build ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj --configuration Release --no-restore
 
       - name: Set version variable
         env:
@@ -56,12 +60,14 @@ jobs:
           fi
           
       - name: Tests
-        run: |
-          dotnet test ./src/${{env.PROJECT_NAME}}.Tests/${{env.PROJECT_NAME}}.Tests.csproj
+        run: dotnet test ./src/${{env.PROJECT_NAME}}.Tests/${{env.PROJECT_NAME}}.Tests.csproj
 
-      - name: Pack package
-        run: dotnet pack ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj -c Release /p:Version=${VERSION} --no-build -o .
+      - name: Pack packages
+        run: |
+          dotnet pack ./src/${{env.PROJECT_NAME}}/${{env.PROJECT_NAME}}.csproj -c Release /p:Version=${VERSION} --no-build -o .
+          dotnet pack ./src/${{env.PROJECT_NAME}}.Prometheus/${{env.PROJECT_NAME}}.Prometheus.csproj -c Release /p:Version=${VERSION} --no-build -o .
 
       - name: List output files
         run: ls -la
 
+
diff --git a/src/Asv.Gnss.sln b/src/Asv.Gnss.sln
@@ -17,7 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.github\workflows\release-debug-version.yml = ..\.github\workflows\release-debug-version.yml
 		..\.github\workflows\release-pre-version.yml = ..\.github\workflows\release-pre-version.yml
 		Directory.Build.props = Directory.Build.props
-		Asv.Gnss\Asv.Gnss.nuspec = Asv.Gnss\Asv.Gnss.nuspec
 	EndProjectSection
 EndProject
 Global

diff --git a/src/Asv.Gnss/Asv.Gnss.nuspec b/src/Asv.Gnss/Asv.Gnss.nuspec
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <Nullable>enable</Nullable>
-        <ProductVersion>1.6.4</ProductVersion>
+        <ProductVersion>1.6.6</ProductVersion>
         <AsvCommonVersion>2.0.0</AsvCommonVersion>
     </PropertyGroup>
 </Project>