diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed590bb..584867e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b607e09..a7cb94f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Upload dotnet package +name: Upload dotnet package on: push: @@ -12,24 +12,34 @@ jobs: deploy: runs-on: ubuntu-latest permissions: + id-token: write packages: write contents: read steps: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x source-url: https://nuget.pkg.github.com/danilolutz/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: dotnet build --configuration Release CoreZipCode.sln + - name: Create the package run: dotnet pack --configuration Release CoreZipCode.sln --include-symbols -p:PackageVersion=${{github.ref_name}} -v normal + - name: Upload a Build Artifact uses: softprops/action-gh-release@v1 with: files: CoreZipCode/bin/Release/CoreZipCode.${{github.ref_name}}.nupkg env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Publish the package to GPR - run: dotnet nuget push CoreZipCode/bin/Release/CoreZipCode.${{github.ref_name}}.nupkg --api-key ${{secrets.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json + + - name: NuGet login + uses: NuGet/login@v1 + id: login + with: + user: ${{ secrets.NUGET_USER }} + + - name: NuGet push + run: dotnet nuget push CoreZipCode/bin/Release/CoreZipCode.${{github.ref_name}}.nupkg --api-key ${{steps.login.outputs.NUGET_API_KEY}} --source https://api.nuget.org/v3/index.json \ No newline at end of file diff --git a/CoreZipCode.Tests/CoreZipCode.Tests.csproj b/CoreZipCode.Tests/CoreZipCode.Tests.csproj index 9be2e14..4db3111 100644 --- a/CoreZipCode.Tests/CoreZipCode.Tests.csproj +++ b/CoreZipCode.Tests/CoreZipCode.Tests.csproj @@ -1,23 +1,23 @@ - net6.0 + net8.0 false true - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - runtime; build; native; contentfiles; analyzers + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CoreZipCode.Tests/Services/ZipCode/SmartyApi/SmartyTest.cs b/CoreZipCode.Tests/Services/ZipCode/SmartyApi/SmartyTest.cs index 46bb1fb..6475feb 100644 --- a/CoreZipCode.Tests/Services/ZipCode/SmartyApi/SmartyTest.cs +++ b/CoreZipCode.Tests/Services/ZipCode/SmartyApi/SmartyTest.cs @@ -188,25 +188,25 @@ public async Task MustGetZipCodeByParamsListAsync() } [Fact] - public void MustThrowTheExceptionsAsync() + public async Task MustThrowTheExceptionsAsync() { - var exception = Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12345678901234567890 ")); - Assert.Equal(InvalidZipCodeSizeMessage, exception.Result.Message); + var exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12345678901234567890 ")); + Assert.Equal(InvalidZipCodeSizeMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12A")); - Assert.Equal(InvalidZipCodeSizeMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12A")); + Assert.Equal(InvalidZipCodeSizeMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync(" 123A5678 ")); - Assert.Equal(InvalidZipCodeFormatMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync(" 123A5678 ")); + Assert.Equal(InvalidZipCodeFormatMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("Lorem ipsum dolor sit amet amet sit", "Mountain View", "1600 Amphitheatre Pkwy")); - Assert.Equal(InvalidStateMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("Lorem ipsum dolor sit amet amet sit", "Mountain View", "1600 Amphitheatre Pkwy")); + Assert.Equal(InvalidStateMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("CA", "Lorem ipsum dolor sit amet, consectetur adipiscing elit posuere posuere.", "1600 Amphitheatre Pkwy")); - Assert.Equal(InvalidCityMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("CA", "Lorem ipsum dolor sit amet, consectetur adipiscing elit posuere posuere.", "1600 Amphitheatre Pkwy")); + Assert.Equal(InvalidCityMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("CA", "Mountain View", "Lorem ipsum dolor sit amet, consectetur adipiscing elit posuere posuere.")); - Assert.Equal(InvalidStreetMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("CA", "Mountain View", "Lorem ipsum dolor sit amet, consectetur adipiscing elit posuere posuere.")); + Assert.Equal(InvalidStreetMessage, exception.Message); } } } \ No newline at end of file diff --git a/CoreZipCode.Tests/Services/ZipCode/ViaCepApi/ViaCepTest.cs b/CoreZipCode.Tests/Services/ZipCode/ViaCepApi/ViaCepTest.cs index 044409a..d31c0bc 100644 --- a/CoreZipCode.Tests/Services/ZipCode/ViaCepApi/ViaCepTest.cs +++ b/CoreZipCode.Tests/Services/ZipCode/ViaCepApi/ViaCepTest.cs @@ -174,31 +174,31 @@ public async Task MustGetZipCodeObjectListAsync() } [Fact] - public void MustThrowTheExceptionsAsync() + public async Task MustThrowTheExceptionsAsync() { - var exception = Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12345-67 ")); - Assert.Equal(InvalidZipCodeSizeMessage, exception.Result.Message); + var exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync(" 12345-67 ")); + Assert.Equal(InvalidZipCodeSizeMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync(" 123A5-678 ")); - Assert.Equal(InvalidZipCodeFormatMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync(" 123A5-678 ")); + Assert.Equal(InvalidZipCodeFormatMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("U", "Araraquara", "barão do rio")); - Assert.Equal(InvalidStateMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("U", "Araraquara", "barão do rio")); + Assert.Equal(InvalidStateMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ar", "barão do rio")); - Assert.Equal(InvalidCityMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ar", "barão do rio")); + Assert.Equal(InvalidCityMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ara", "ba")); - Assert.Equal(InvalidStreetMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ara", "ba")); + Assert.Equal(InvalidStreetMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("", "Araraquara", "barão do rio")); - Assert.Equal(InvalidStateMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("", "Araraquara", "barão do rio")); + Assert.Equal(InvalidStateMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "", "barão do rio")); - Assert.Equal(InvalidCityMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "", "barão do rio")); + Assert.Equal(InvalidCityMessage, exception.Message); - exception = Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ara", "")); - Assert.Equal(InvalidStreetMessage, exception.Result.Message); + exception = await Assert.ThrowsAsync(() => _service.ExecuteAsync("SP", "Ara", "")); + Assert.Equal(InvalidStreetMessage, exception.Message); } } } \ No newline at end of file diff --git a/CoreZipCode/CoreZipCode.csproj b/CoreZipCode/CoreZipCode.csproj index 8bc9ca4..b881b3c 100644 --- a/CoreZipCode/CoreZipCode.csproj +++ b/CoreZipCode/CoreZipCode.csproj @@ -5,7 +5,7 @@ CoreZipCode CoreZipCode - 2.0.8 + 2.0.9 Danilo Lutz Danilo Lutz https://github.com/danilolutz/CoreZipCode/blob/master/LICENSE @@ -37,7 +37,7 @@ - + diff --git a/SampleApp/Program.cs b/SampleApp/Program.cs index 5b7ede0..9d2f5ae 100644 --- a/SampleApp/Program.cs +++ b/SampleApp/Program.cs @@ -97,7 +97,7 @@ static bool PrintMenu() Console.WriteLine(" |**** CoreZipCode Demo Application ****|"); Console.WriteLine(" ---------------------------------------"); Console.WriteLine(" 1 - ViaCep Service"); - Console.WriteLine(" 2 - SmartyStreets Service"); + Console.WriteLine(" 2 - Smarty Service"); Console.WriteLine(" 3 - PostalpincodeIn Service"); Console.WriteLine(" 4 - PostcodesIo Service"); Console.WriteLine(" 5 - Get out"); diff --git a/SampleApp/SampleApp.csproj b/SampleApp/SampleApp.csproj index db1c1e1..c62f62f 100644 --- a/SampleApp/SampleApp.csproj +++ b/SampleApp/SampleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable