Skip to content

Feature/assembly-strongname #892

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

Merged
Shane32 merged 3 commits into from
Aug 15, 2022
Merged

Feature/assembly-strongname #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
134d89f
Feature/assembly-strongname
Shane32 Aug 13, 2022
3d2415b
Update
Shane32 Aug 13, 2022
7b54aa3
Update Directory.Build.props
Shane32 Aug 15, 2022
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
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,12 @@ jobs:
run: dotnet build --no-restore -c Release
- name: Build solution [Debug]
run: dotnet build --no-restore -c Debug
- name: Test solution [Debug]
- name: Test solution [Debug] with code coverage
if: ${{ startsWith(matrix.os, 'ubuntu') }}
run: dotnet test --no-restore --no-build -p:CollectCoverage=true
- name: Test solution [Debug] without code coverage
if: ${{ startsWith(matrix.os, 'windows') }}
run: dotnet test --no-restore --no-build
- name: Upload coverage to codecov
if: ${{ startsWith(matrix.os, 'ubuntu') }}
uses: codecov/codecov-action@v3
Expand Down
9 changes: 4 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
<RootNamespace>GraphQL.Server.$(MSBuildProjectName)</RootNamespace>
<PackageId>GraphQL.Server.$(MSBuildProjectName)</PackageId>

<GraphQLVersion>6.0.0-preview-612</GraphQLVersion>
<GraphQLVersion>7.0.0-preview-641</GraphQLVersion>

<SignAssembly>true</SignAssembly>
<_FriendAssembliesPublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100352162dbf27be78fc45136884b8f324aa9f1dfc928c96c24704bf1df1a8779b2f26c760ed8321eca5b95ea6bd9bb60cd025b300f73bd1f4ae1ee6e281f85c527fa013ab5cb2c3fc7a1cbef7f9bf0c9014152e6a21f6e0ac6a371f8b45c6d7139c9119df9eeecf1cf59063545bb7c07437b1bc12be2c57d108d72d6c27176fbb8</_FriendAssembliesPublicKey>
</PropertyGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
Expand All @@ -37,8 +40,4 @@
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
<InternalsVisibleTo Include="$(AssemblyName).Tests" />
</ItemGroup>

</Project>
9 changes: 9 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,13 @@
<AnalysisMode>Recommended</AnalysisMode>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<PropertyGroup Condition="'$(SignAssembly)' == 'true'">
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)graphql.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
<InternalsVisibleTo Condition="'$(SignAssembly)' == 'true'" Include="$(AssemblyName).Tests, $(_FriendAssembliesPublicKey)"/>
<InternalsVisibleTo Condition="'$(SignAssembly)' != 'true'" Include="$(AssemblyName).Tests"/>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions GraphQL.Server.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solutio
.gitignore = .gitignore
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
graphql.snk = graphql.snk
LICENSE.md = LICENSE.md
README.md = README.md
Tests.props = Tests.props
Expand Down
Binary file added graphql.snk
View file
Open in desktop
Binary file not shown.
11 changes: 4 additions & 7 deletions tests/Transports.AspNetCore.Tests/Middleware/FileUploadTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,10 @@ public MySchema()
{
Name = "Query",
};
query.Field<StringGraphType>(
"ConvertToBase64",
arguments: new QueryArguments(
new QueryArgument(typeof(StringGraphType)) { Name = "prefix" },
new QueryArgument(typeof(NonNullGraphType<FileGraphType>)) { Name = "file" }
),
resolve: context =>
query.Field<StringGraphType>("ConvertToBase64")
.Argument<StringGraphType>("prefix")
.Argument<NonNullGraphType<FileGraphType>>("file")
.Resolve(context =>
{
var prefix = context.GetArgument<string?>("prefix");
var file = context.GetArgument<IFormFile>("file");
Expand Down