diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0b47df5..a259c1c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Publish +name: Publish on: workflow_dispatch: {} @@ -29,19 +29,9 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup .NET - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.x - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build Intercom/Intercom.csproj --no-restore --configuration Release - - name: Publish - uses: laget-se/publish-nuget@v2.7.2 - with: - INCLUDE_SYMBOLS: true - NUGET_KEY: ${{secrets.NUGET_API_KEY}} - NUSPEC_FILE: Intercom.nuspec - PROJECT_FILE_PATH: Intercom/Intercom.csproj - VERSION_STATIC: "0.1.${{github.run_number}}-alpha" + - run: dotnet build --configuration Release Payment.System.Sdk/Payment.System.Sdk.csproj + - run: dotnet pack --configuration Release Payment.System.Sdk/Payment.System.Sdk.csproj -p:Version=0.1.${{github.run_number}}-alpha -p:PackageVersion=0.1.${{github.run_number}}-alpha -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:NuspecFile=Payment.System.Sdk.nuspec + - run: dotnet nuget push Payment.System.Sdk\bin\Release\laget.Payment.System.Sdk.%system.build.number%-alpha.nupkg --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 82d7b75..777f505 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | + 7.0.x 6.0.x 3.1.x - name: Restore dependencies diff --git a/Intercom.Tests/Intercom.Tests.csproj b/Intercom.Tests/Intercom.Tests.csproj index 3ab4fb0..343adab 100644 --- a/Intercom.Tests/Intercom.Tests.csproj +++ b/Intercom.Tests/Intercom.Tests.csproj @@ -3,11 +3,12 @@ - net48;netcoreapp3.1;net6.0 + net7.0;net6.0;netcoreapp3.1;net48 false diff --git a/Intercom/Intercom.csproj b/Intercom/Intercom.csproj index 50bfa12..7a2e0be 100644 --- a/Intercom/Intercom.csproj +++ b/Intercom/Intercom.csproj @@ -1,7 +1,7 @@  - netstandard2.0;netstandard2.1;net6.0 + net7.0;net6.0;netstandard2.1;netstandard2.0 version=$(Version) diff --git a/Intercom/Intercom.nuspec b/Intercom/Intercom.nuspec index 9848ba7..79e899d 100644 --- a/Intercom/Intercom.nuspec +++ b/Intercom/Intercom.nuspec @@ -15,7 +15,11 @@ assets\README.md - + + + + + @@ -23,7 +27,7 @@ - + @@ -32,8 +36,9 @@ - - + + +