Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/pr-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
build-extension:
runs-on: ubuntu-latest
env:
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
RepositoryUrl: 'https://github.com/${{ github.repository }}'
Expand All @@ -18,23 +18,23 @@ jobs:
PackageReleaseNotes: 'https://github.com/${{ github.repository }}/releases'
ContinuousIntegrationBuild: true
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 7
- uses: actions/checkout@v2
- name: Setup .NET Core 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0'
dotnet-version: '8.0'
- name: Calculate next version
uses: cezarypiatek/[email protected]
with:
minor-pattern: '.*'
major-pattern: 'BREAKING CHANGES'
output-to-env-variable: 'VersionPrefix'
output-to-env-variable: 'VersionPrefix'
- name: Restore dependencies
run: |
dotnet nuget locals all --clear
dotnet restore ${{ env.SolutionPath }}
- name: Build extension
run: dotnet build ${{ env.SolutionPath }} -maxcpucount:1
run: dotnet build ${{ env.SolutionPath }} -maxcpucount:1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build docker
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
PackageLicenseExpression: 'MIT'
steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 7
- name: Setup .NET Core 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0'
dotnet-version: '8.0'
- name: Calculate next version
uses: cezarypiatek/[email protected]
with:
Expand All @@ -41,7 +41,7 @@ jobs:
shell: pwsh
- name: Build extension
run: |
dotnet build $env:SolutionPath -maxcpucount:1
dotnet build $env:SolutionPath -maxcpucount:1
shell: pwsh
- name: Generate release note
run: |
Expand Down
6 changes: 3 additions & 3 deletions src/GrpcMockServer/GrpcMockServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand All @@ -22,8 +22,8 @@
<PackageReference Include="GrpcTestKit" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.53.0" />
<PackageReference Include="WireMock.Net" Version="1.5.25" />
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
<PackageReference Include="WireMock.Net" Version="1.6.7" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion src/GrpcTestKit.Demo/GrpcTestKit.Demo.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 2 additions & 0 deletions src/GrpcToRestGenerator/GrpcMockServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
using GrpcTestKit.TestConnectors;
using System;
using System.Net;
using System.Threading;
using System.Linq;

/*MockServerNamespace*/

Expand Down
5 changes: 5 additions & 0 deletions src/GrpcToRestGenerator/StubHelperBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ public string Build(IReadOnlyList<INamedTypeSymbol> proxyBaseClasses)
{
{
{
_stubBuilder.AppendLine("using System;");
_stubBuilder.AppendLine("using GrpcTestKit.TestConnectors;");
_stubBuilder.AppendLine("using System.Threading;");
_stubBuilder.AppendLine("using System.Threading.Tasks;");
_stubBuilder.AppendLine("using System.Linq;");
_stubBuilder.AppendLine("using System.Collections.Generic;");
if (string.IsNullOrWhiteSpace(_helperNamespace) == false)
{
_stubBuilder.AppendLine($"namespace {_helperNamespace};");
Expand Down
2 changes: 1 addition & 1 deletion src/dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0
FROM mcr.microsoft.com/dotnet/sdk:8.0
ADD ./ /src
ADD run.sh /src/run.sh
RUN chmod +x /src/run.sh
Expand Down
Loading