Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve local smoke tests and introduce dev containers support #128

Merged
merged 12 commits into from
Aug 24, 2023
Merged

Improve local smoke tests and introduce dev containers support #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3c0094d
Update Refit.HttpClientFactory to version 7.0.0
christianhelle Aug 21, 2023
cf40a27
Simplified project structure and upgraded dependencies
christianhelle Aug 21, 2023
222fa9d
Enable compiler-generated files emission in test app
christianhelle Aug 21, 2023
6205560
Refactor generate and build process in smoke-tests.ps1 to generate an…
christianhelle Aug 21, 2023
b0b3489
Add Task.Delay in main method for async execution
christianhelle Aug 21, 2023
026d6d3
Enforced warnings as errors in GitHub workflows build step
christianhelle Aug 21, 2023
b60381d
Revert "Enforced warnings as errors in GitHub workflows build step"
christianhelle Aug 21, 2023
25d5ebc
Update converted local smoke test script
Aug 22, 2023
dca814e
Refine triggers for smoke tests workflow
christianhelle Aug 22, 2023
1f63d4e
Update local smoke tests to generate using settings file
christianhelle Aug 24, 2023
6df332e
Add devcontainer setup
christianhelle Aug 24, 2023
554806f
Update smoke-tests.sh to just call the powershell script
christianhelle Aug 24, 2023
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
31 changes: 31 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
{
"name": "C# (.NET)",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/dotnet:0-6.0",
"features": {
"ghcr.io/devcontainers/features/powershell:1": {},
"ghcr.io/devcontainers/features/dotnet:1": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [5000, 5001],
// "portsAttributes": {
// "5001": {
// "protocol": "https"
// }
// }

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "dotnet restore",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
4 changes: 2 additions & 2 deletions .github/workflows/smoke-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
push:
paths-ignore:
- "**/*"
- "!**/*.cs"
- "!**/*.csproj"
- '!src/**/*.cs'
- '!src/**/*.csproj'
- "!.github/workflows/template.yml"
- "!.github/workflows/template-url.yml"
- "!.github/workflows/smoke-tests.yml"
Expand Down
18 changes: 18 additions & 0 deletions test/ConsoleApp/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project>
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
<Compile Include="../../GeneratedCode/*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="7.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions test/ConsoleApp/Net462/Net462.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -21,10 +14,4 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions test/ConsoleApp/Net472/Net472.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -21,10 +14,4 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
25 changes: 0 additions & 25 deletions test/ConsoleApp/Net48/Net48.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions test/ConsoleApp/Net481/Net481.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net481</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -21,10 +14,4 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions test/ConsoleApp/Net6/Net6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include = "Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include = "System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include = "System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
13 changes: 0 additions & 13 deletions test/ConsoleApp/Net7/Net7.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Program.cs">
<Link>Program.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions test/ConsoleApp/NetStandard20/NetStandard20.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include = "Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include = "System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include = "System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions test/ConsoleApp/NetStandard21/NetStandard21.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include = "Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include = "System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include = "System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions test/ConsoleApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ private static async Task Main(string[] args)
{
// await TestPetstoreUsingDirectTypes();
// await TestPetstoreUsingApiResponse();
await Task.Delay(0);
}

// private static async Task TestPetstoreUsingApiResponse()
Expand Down
3 changes: 2 additions & 1 deletion test/MinimalApi/MinimalApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />
<PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/SourceGenerator/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Compile Include="../Generated/*.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Refitter.SourceGenerator" Version="0.7.3.33-preview" />
<PackageReference Include="Refitter.SourceGenerator" Version="0.7.3.35-preview" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
</ItemGroup>
Expand Down
Loading