Skip to content

Commit 1fdf4d9

Browse files
authored
Merge branch 'master' into dependabot/nuget/xunit.runner.visualstudio-2.8.1
2 parents 47303bb + 996f765 commit 1fdf4d9

File tree

81 files changed

+1822
-1455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1822
-1455
lines changed

Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4-
<VersionPrefix>7.8.0-preview</VersionPrefix>
5-
<NextVersion>8.0.0</NextVersion>
4+
<VersionPrefix>8.0.2-preview</VersionPrefix>
5+
<NextVersion>9.0.0</NextVersion>
66
<LangVersion>latest</LangVersion>
77
<PackageLicenseExpression>MIT</PackageLicenseExpression>
88
<PackageIcon>logo.64x64.png</PackageIcon>
@@ -32,7 +32,7 @@
3232
<RootNamespace>GraphQL.Server.$(MSBuildProjectName)</RootNamespace>
3333
<PackageId>GraphQL.Server.$(MSBuildProjectName)</PackageId>
3434

35-
<GraphQLVersion>[7.6.0,8.0.0)</GraphQLVersion>
35+
<GraphQLVersion>[8.2.1,9.0.0)</GraphQLVersion>
3636

3737
<SignAssembly>true</SignAssembly>
3838
<_FriendAssembliesPublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100352162dbf27be78fc45136884b8f324aa9f1dfc928c96c24704bf1df1a8779b2f26c760ed8321eca5b95ea6bd9bb60cd025b300f73bd1f4ae1ee6e281f85c527fa013ab5cb2c3fc7a1cbef7f9bf0c9014152e6a21f6e0ac6a371f8b45c6d7139c9119df9eeecf1cf59063545bb7c07437b1bc12be2c57d108d72d6c27176fbb8</_FriendAssembliesPublicKey>
@@ -43,7 +43,7 @@
4343
<ItemGroup Condition="'$(IsPackable)' == 'true'">
4444
<None Include="..\..\assets\logo.64x64.png" Pack="true" PackagePath="\" Visible="false" />
4545
<None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
46-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
46+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4747
</ItemGroup>
4848

4949
</Project>

GraphQL.Server.sln

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solutio
1212
.gitignore = .gitignore
1313
Directory.Build.props = Directory.Build.props
1414
Directory.Build.targets = Directory.Build.targets
15+
global.json = global.json
1516
graphql.snk = graphql.snk
1617
LICENSE.md = LICENSE.md
1718
README.md = README.md
@@ -96,15 +97,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Net48.Tests", "test
9697
EndProject
9798
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Pages.Tests", "tests\Samples.Pages.Tests\Samples.Pages.Tests.csproj", "{BF4ED814-A21D-45F5-8F71-54148751AE81}"
9899
EndProject
99-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore", "src\Authorization.AspNetCore\Authorization.AspNetCore.csproj", "{A4875E2D-62AF-4D86-9D8A-19A310365FE8}"
100-
EndProject
101-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.AspNetCore.Tests", "tests\Authorization.AspNetCore.Tests\Authorization.AspNetCore.Tests.csproj", "{9AEB9941-618B-430A-A14C-37F39AFFC0C4}"
102-
EndProject
103100
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{AB155A1E-CB5E-465E-BC29-A1A4A5D9D2B0}"
104101
EndProject
105102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Migration", "Migration", "{FF0810A0-3372-40ED-B3E3-D703BEF0F118}"
106103
ProjectSection(SolutionItems) = preProject
107104
docs\migration\migration7.md = docs\migration\migration7.md
105+
docs\migration\migration8.md = docs\migration\migration8.md
108106
EndProjectSection
109107
EndProject
110108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Jwt", "samples\Samples.Jwt\Samples.Jwt.csproj", "{5A16B117-0FAD-4F91-A97C-E72B733B4E57}"
@@ -120,7 +118,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureFunctions", "s
120118
EndProject
121119
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureFunctions.Tests", "tests\Samples.AzureFunctions.Tests\Samples.AzureFunctions.Tests.csproj", "{A204E359-05E8-4CEE-891C-4CCA6570FA52}"
122120
EndProject
123-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Upload", "samples\Samples.Upload\Samples.Upload.csproj", "{33E2CDF5-F854-4F1A-80D5-DBF0BDF8EEA8}"
121+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Upload", "samples\Samples.Upload\Samples.Upload.csproj", "{33E2CDF5-F854-4F1A-80D5-DBF0BDF8EEA8}"
124122
EndProject
125123
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Upload.Tests", "tests\Samples.Upload.Tests\Samples.Upload.Tests.csproj", "{DE3059F4-B548-4091-BFC0-5879246A2DF9}"
126124
EndProject
@@ -242,14 +240,6 @@ Global
242240
{BF4ED814-A21D-45F5-8F71-54148751AE81}.Debug|Any CPU.Build.0 = Debug|Any CPU
243241
{BF4ED814-A21D-45F5-8F71-54148751AE81}.Release|Any CPU.ActiveCfg = Release|Any CPU
244242
{BF4ED814-A21D-45F5-8F71-54148751AE81}.Release|Any CPU.Build.0 = Release|Any CPU
245-
{A4875E2D-62AF-4D86-9D8A-19A310365FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246-
{A4875E2D-62AF-4D86-9D8A-19A310365FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
247-
{A4875E2D-62AF-4D86-9D8A-19A310365FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
248-
{A4875E2D-62AF-4D86-9D8A-19A310365FE8}.Release|Any CPU.Build.0 = Release|Any CPU
249-
{9AEB9941-618B-430A-A14C-37F39AFFC0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
250-
{9AEB9941-618B-430A-A14C-37F39AFFC0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
251-
{9AEB9941-618B-430A-A14C-37F39AFFC0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
252-
{9AEB9941-618B-430A-A14C-37F39AFFC0C4}.Release|Any CPU.Build.0 = Release|Any CPU
253243
{5A16B117-0FAD-4F91-A97C-E72B733B4E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
254244
{5A16B117-0FAD-4F91-A97C-E72B733B4E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
255245
{5A16B117-0FAD-4F91-A97C-E72B733B4E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -306,7 +296,6 @@ Global
306296
{15043767-3620-4505-9DA9-78E3E5C05E18} = {BBD07745-C962-4D2D-B302-6DA1BCC2FF43}
307297
{08E0FF4C-9131-4523-A6EF-4C1FCE7EFA05} = {BBD07745-C962-4D2D-B302-6DA1BCC2FF43}
308298
{BF4ED814-A21D-45F5-8F71-54148751AE81} = {BBD07745-C962-4D2D-B302-6DA1BCC2FF43}
309-
{9AEB9941-618B-430A-A14C-37F39AFFC0C4} = {BBD07745-C962-4D2D-B302-6DA1BCC2FF43}
310299
{FF0810A0-3372-40ED-B3E3-D703BEF0F118} = {AB155A1E-CB5E-465E-BC29-A1A4A5D9D2B0}
311300
{5A16B117-0FAD-4F91-A97C-E72B733B4E57} = {5C07AFA3-12F2-40EA-807D-7A1EEF29012B}
312301
{2B5A39E8-098F-458E-981C-BC9470CB94B0} = {BBD07745-C962-4D2D-B302-6DA1BCC2FF43}

0 commit comments

Comments
 (0)