Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
4 changes: 4 additions & 0 deletions .devcontainer/backend/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
"moby": "true"
}
},
"containerEnv": {
"DOTNET_LOCAL_DEV": "1"
},
"postCreateCommand": "dotnet build src/All.slnx",
"postStartCommand": "bash /workspaces/${localWorkspaceFolderBasename}/.devcontainer/setup-git-signing.sh",
"customizations": {
"vscode": {
"extensions": [
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/frontend/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}/website",
"postCreateCommand": "yarn install --immutable && yarn playwright install chromium",
"postStartCommand": "bash /workspaces/${localWorkspaceFolderBasename}/.devcontainer/setup-git-signing.sh",
"containerEnv": {
"NEXT_TELEMETRY_DISABLED": "1",
"CHILLICREAM_FRONTEND_ENV": "devcontainer"
Expand Down
30 changes: 30 additions & 0 deletions .devcontainer/setup-git-signing.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env bash
# Commits are signed with an SSH key (gpg.format=ssh). The dev container inherits
# the host's ~/.gitconfig and a forwarded SSH agent, but no key files, so the
# public key that user.signingKey points at does not exist here and every commit
# fails. Recreate it from the agent; the private key never leaves the host.
set -euo pipefail

[[ "$(git config --get gpg.format || true)" == "ssh" ]] || exit 0

key_path="$(git config --get user.signingKey || true)"
case "${key_path}" in
key::*) exit 0 ;; # key material is inline, no file needed
"") key_path="${HOME}/.ssh/id_ed25519.pub" ;;
"~/"*) key_path="${HOME}/${key_path#\~/}" ;;
esac

if [[ -s "${key_path}" ]]; then
exit 0
fi

key="$(ssh-add -L 2>/dev/null | grep -m1 '^ssh-ed25519 ' || true)"
if [[ -z "${key}" ]]; then
echo "git signing: no ed25519 key in the SSH agent, ${key_path} not written." >&2
echo "git signing: check that the host agent has your key and is forwarded." >&2
exit 0
fi
Comment thread
tobias-tengler marked this conversation as resolved.
Resolved

mkdir -p "$(dirname "${key_path}")"
echo "${key}" > "${key_path}"
echo "git signing: wrote ${key_path} from the forwarded SSH agent."
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>$(AnalyzerTargetFramework)</TargetFrameworks>
<TargetFramework>$(AnalyzerTargetFramework)</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput> <!-- Do not include the generator as a lib dependency -->
<IncludeSymbols>false</IncludeSymbols>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
Expand Down
26 changes: 25 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,40 @@
</PropertyGroup>

<PropertyGroup>
<AnalyzerTargetFramework>netstandard2.0</AnalyzerTargetFramework>
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
<ExtendedTargetFrameworks>net11.0;net10.0;net9.0;net8.0;netstandard2.0</ExtendedTargetFrameworks>
<ExtendedTargetFrameworks>net11.0;net10.0;net9.0;net8.0;$(AnalyzerTargetFramework)</ExtendedTargetFrameworks>
<OpenApiTargetFrameworks>net11.0;net10.0;net9.0</OpenApiTargetFrameworks>
<AspireTargetFrameworks>net11.0;net10.0;net9.0</AspireTargetFrameworks>
<DemoTargetFramework>net11.0</DemoTargetFramework>
<BenchmarkTargetFramework>net11.0</BenchmarkTargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(DOTNET_LOCAL_DEV)' == '1'">
<LocalDevTargetFramework>net10.0</LocalDevTargetFramework>
<TargetFrameworks>$(LocalDevTargetFramework)</TargetFrameworks>
<ExtendedTargetFrameworks>$(LocalDevTargetFramework);$(AnalyzerTargetFramework)</ExtendedTargetFrameworks>
<OpenApiTargetFrameworks>$(LocalDevTargetFramework)</OpenApiTargetFrameworks>
<AspireTargetFrameworks>$(LocalDevTargetFramework)</AspireTargetFrameworks>
<DemoTargetFramework>$(LocalDevTargetFramework)</DemoTargetFramework>
</PropertyGroup>

<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<!--
Local dev only builds the single target framework that local runs and tests use.
Analyzers and source generators keep netstandard2.0 so they still load into Roslyn.
-->
<PropertyGroup Condition="'$(DOTNET_LOCAL_DEV)' == '1'">
<LocalDevTargetFramework>net10.0</LocalDevTargetFramework>
<TargetFrameworks>$(LocalDevTargetFramework)</TargetFrameworks>
<ExtendedTargetFrameworks>$(LocalDevTargetFramework);netstandard2.0</ExtendedTargetFrameworks>
<OpenApiTargetFrameworks>$(LocalDevTargetFramework)</OpenApiTargetFrameworks>
</PropertyGroup>
Comment thread
tobias-tengler marked this conversation as resolved.
Resolved

<PropertyGroup Condition="'$(DOTNET_LOCAL_DEV)' == '1'">
<CreateHardLinksForCopyLocalIfPossible>true</CreateHardLinksForCopyLocalIfPossible>
<CreateHardLinksForAdditionalFilesIfPossible>true</CreateHardLinksForAdditionalFilesIfPossible>
Expand Down
4 changes: 2 additions & 2 deletions src/HotChocolate/AspNetCore/benchmarks/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>$(BenchmarkTargetFramework)</TargetFrameworks>
<TargetFramework>$(BenchmarkTargetFramework)</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace>eShop.Catalog</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.2" />
<Sdk Name="Aspire.AppHost.Sdk" Version="13.4.6" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>f2d3a820-9a6b-4453-96e4-3e0ba86bd53d</UserSecretsId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand Down
2 changes: 2 additions & 0 deletions src/HotChocolate/Core/benchmarks/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFramework>$(BenchmarkTargetFramework)</TargetFramework>
<TargetFrameworks>$(BenchmarkTargetFramework)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>Preview</LangVersion>
<AssemblyName>HotChocolate.Execution.Abstractions.Benchmarks</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>Preview</LangVersion>
<AssemblyName>HotChocolate.Validation.Benchmarks</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Nullable.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>$(AnalyzerTargetFramework)</TargetFrameworks>
<TargetFramework>$(AnalyzerTargetFramework)</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput> <!-- Do not include the generator as a lib dependency -->
<IncludeSymbols>false</IncludeSymbols>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net11.0</TargetFrameworks>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>Preview</LangVersion>
<AssemblyName>HotChocolate.Fusion.Composition.Benchmarks</AssemblyName>
Expand Down
2 changes: 2 additions & 0 deletions src/HotChocolate/Fusion/benchmarks/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFramework>$(BenchmarkTargetFramework)</TargetFramework>
<TargetFrameworks>$(BenchmarkTargetFramework)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<IsPackable>false</IsPackable>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net11.0;net10.0</TargetFrameworks>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>Preview</LangVersion>
<AssemblyName>HotChocolate.Fusion.Execution.Benchmarks</AssemblyName>
Expand Down
2 changes: 0 additions & 2 deletions src/HotChocolate/Fusion/benchmarks/k6/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFrameworks>net11.0</TargetFrameworks>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<AssemblyName>HotChocolate.Fusion.Aspire</AssemblyName>
<RootNamespace>HotChocolate.Fusion.Aspire</RootNamespace>
<TargetFrameworks>net11.0; net10.0; net9.0</TargetFrameworks>
<TargetFrameworks>$(AspireTargetFrameworks)</TargetFrameworks>
<IsAotCompatible>false</IsAotCompatible>
<EnableAspireIntegrationAnalyzers>true</EnableAspireIntegrationAnalyzers>
<PackageTags>$(PackageTags) polyglot</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<AssemblyName>HotChocolate.Fusion.Aspire.Tests</AssemblyName>
<RootNamespace>HotChocolate.Fusion.Aspire</RootNamespace>
<TargetFrameworks>net11.0;net10.0;net9.0</TargetFrameworks>
<TargetFrameworks>$(AspireTargetFrameworks)</TargetFrameworks>
<NoWarn>$(NoWarn);ASPIREINTERACTION001</NoWarn>
</PropertyGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/HotChocolate/Language/benchmarks/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<TargetFramework>$(BenchmarkTargetFramework)</TargetFramework>
<TargetFrameworks>$(BenchmarkTargetFramework)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net11.0</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<LangVersion>Preview</LangVersion>
<AssemblyName>HotChocolate.Language.Benchmarks</AssemblyName>
Expand Down
4 changes: 2 additions & 2 deletions src/Mocha/benchmarks/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net11.0</TargetFramework>
<TargetFrameworks>net11.0</TargetFrameworks>
<TargetFramework>$(BenchmarkTargetFramework)</TargetFramework>
<TargetFrameworks>$(BenchmarkTargetFramework)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 0 additions & 4 deletions src/Mocha/examples/AotExample/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<CompilerVisibleProperty Include="PublishAot" />
<CompilerVisibleProperty Include="IsAotCompatible" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion src/Mocha/examples/Demo/Demo.Billing/Demo.Billing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AssemblyName>HotChocolate.Demo.Billing</AssemblyName>
<RootNamespace>HotChocolate.Demo.Billing</RootNamespace>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Demo.ServiceDefaults\Demo.ServiceDefaults.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/Mocha/examples/Demo/Demo.Catalog/Demo.Catalog.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AssemblyName>HotChocolate.Demo.Catalog</AssemblyName>
<RootNamespace>HotChocolate.Demo.Catalog</RootNamespace>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Mocha.Transport.InMemory\Mocha.Transport.InMemory.csproj" />
Expand Down
1 change: 0 additions & 1 deletion src/Mocha/examples/Demo/Demo.Shipping/Demo.Shipping.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<AssemblyName>HotChocolate.Demo.Shipping</AssemblyName>
<RootNamespace>HotChocolate.Demo.Shipping</RootNamespace>
<TargetFramework>net11.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Demo.ServiceDefaults\Demo.ServiceDefaults.csproj" />
Expand Down
3 changes: 2 additions & 1 deletion src/Mocha/examples/Demo/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />

<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Mocha/examples/Demo/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="11.0.0-preview.6.26359.118" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'debug'">
<PackageVersion Include="ChilliCream.AnalyzerConfig.Libraries" Version="1.0.0" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
Expand Down
2 changes: 2 additions & 0 deletions src/Mocha/examples/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<TargetFramework>$(DemoTargetFramework)</TargetFramework>
<TargetFrameworks>$(DemoTargetFramework)</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/Mocha/examples/PostgresTransport/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net11.0</TargetFramework>
<TargetFrameworks>net11.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Mocha/src/Mocha.Analyzers/Mocha.Analyzers.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>$(AnalyzerTargetFramework)</TargetFrameworks>
<TargetFramework>$(AnalyzerTargetFramework)</TargetFramework>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Test.props', '$(MSBuildThisFileDirectory)'))" />
<PropertyGroup>
<TargetFrameworks>net11.0</TargetFrameworks>
<TargetFrameworks>$(DemoTargetFramework)</TargetFrameworks>
<AssemblyName>HotChocolate.Demo.Catalog.Tests</AssemblyName>
<RootNamespace>HotChocolate.Demo.Catalog.Tests</RootNamespace>
</PropertyGroup>
Expand Down
Loading