diff --git a/.github/workflows/publish_ci.yml b/.github/workflows/publish_ci.yml index b782045bd..fba9276cc 100644 --- a/.github/workflows/publish_ci.yml +++ b/.github/workflows/publish_ci.yml @@ -31,7 +31,7 @@ jobs: dotnet-version: 7.0.401 - name: Add the GitHub source - run: dotnet nuget add source --username USERNAME --password ${{secrets.GITHUB_TOKEN}} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/fsprojects/index.json" + run: dotnet nuget add source --username USERNAME --password ${{secrets.GITHUB_TOKEN}} --store-password-in-clear-text --name "github.com" "https://nuget.pkg.github.com/fsprojects/index.json" - name: Install local tools run: dotnet tool restore @@ -45,7 +45,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Shared project to GitHub run: | - dotnet nuget push nuget/*Shared*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push nuget/*Shared*.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Client project run: | @@ -53,7 +53,7 @@ jobs: dotnet pack --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Client project to GitHub run: | - dotnet nuget push nuget/*Client*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push nuget/*Client*.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server project run: | @@ -61,7 +61,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server project to GitHub run: | - dotnet nuget push nuget/*Server*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push nuget/*Server*.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server.Relay project run: | @@ -69,7 +69,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server.Relay project to GitHub run: | - dotnet nuget push nuget/*Server.Relay*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push nuget/*Server.Relay*.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server.Middleware project run: | @@ -77,7 +77,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server.Middleware project to GitHub run: | - dotnet nuget push nuget/*Server.Middleware*.nupkg -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push nuget/*Server.Middleware*.nupkg -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate - name: Prepare the sample project to be packed as a project template run: | @@ -91,5 +91,5 @@ jobs: - name: Publish FSharp.Data.GraphQL.ProjectTemplates project to GitHub run: | $path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg" - dotnet nuget push $path -s "github" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate + dotnet nuget push $path -s "github.com" -k ${{secrets.GITHUB_TOKEN}} --skip-duplicate shell: pwsh diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index c68567031..c19c8b1b9 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -18,7 +18,7 @@ jobs: - name: Set Build Version run: | - $version = "$env:GITHUB_REF_NAME" + $version = "$env:GITHUB_REF_NAME".Substring("releases/".Length) $File = ( Select-Xml -XPath "/Project/PropertyGroup[@Label='NuGet']/Version" -Path "Directory.Build.props" )[0].Node @@ -44,7 +44,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Shared project to NuGet run: | - dotnet nuget push nuget/*Shared*.nupkg -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push nuget/*Shared*.nupkg -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Client project run: | @@ -52,7 +52,7 @@ jobs: dotnet pack --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Client project to NuGet run: | - dotnet nuget push nuget/*Client*.nupkg -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push nuget/*Client*.nupkg -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server project run: | @@ -60,7 +60,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server project to NuGet run: | - dotnet nuget push nuget/*Server*.nupkg -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push nuget/*Server*.nupkg -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server.Relay project run: | @@ -68,7 +68,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server.Relay project to NuGet run: | - dotnet nuget push nuget/*Server.Relay*.nupkg -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push nuget/*Server.Relay*.nupkg -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate - name: Pack FSharp.Data.GraphQL.Server.Middleware project run: | @@ -76,7 +76,7 @@ jobs: dotnet pack --no-build --nologo --configuration Release /p:IsNuGet=true /p:ContinuousIntegrationBuild=true -o ../../nuget - name: Publish FSharp.Data.GraphQL.Server.Middleware project to NuGet run: | - dotnet nuget push nuget/*Server.Middleware*.nupkg -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push nuget/*Server.Middleware*.nupkg -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate - name: Prepare the sample project to be packed as a project template run: | @@ -90,5 +90,5 @@ jobs: - name: Publish FSharp.Data.GraphQL.ProjectTemplates project to GitHub run: | $path = "nuget/FSharp.Data.GraphQL.ProjectTemplates.$Env:VERSION.nupkg" - dotnet nuget push $path -k ${{secrets.NUGET_SECRET}} --skip-duplicate + dotnet nuget push $path -s "nuget.org" -k ${{secrets.NUGET_SECRET}} --skip-duplicate shell: pwsh diff --git a/Packages.props b/Packages.props index f37d360ad..d218a4bdb 100644 --- a/Packages.props +++ b/Packages.props @@ -5,7 +5,7 @@ 7.0.* 7.0.* 4.9.* - 2.5.0 + 2.6.6 6.* @@ -45,7 +45,7 @@ - + @@ -56,7 +56,7 @@ - +