Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 74e345f

Browse files
Main project compiling on v9 Alpha 4 and .NET 5
1 parent c4a06f1 commit 74e345f

File tree

181 files changed

+3578
-4669
lines changed

Some content is hidden

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

181 files changed

+3578
-4669
lines changed

‎.gitignore‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,10 @@ node_modules/
1616
[Bb]in/
1717
[Oo]bj/
1818
CurrentSettings.vssettings
19-
Visual Studio 2017/*
19+
Visual Studio 2017/*
20+
/src/Our.Umbraco.GraphQL/umbraco/config/
21+
/src/Our.Umbraco.GraphQL/umbraco/PartialViewMacros/
22+
/src/Our.Umbraco.GraphQL/umbraco/UmbracoBackOffice/
23+
/src/Our.Umbraco.GraphQL/umbraco/UmbracoInstall/
24+
/src/Our.Umbraco.GraphQL/umbraco/UmbracoWebsite/
25+
/src/Our.Umbraco.GraphQL/wwwroot/umbraco/

‎Our.Umbraco.GraphQL.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Umbraco.GraphQL.Tests",
1515
EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9B941129-D270-4DD7-A43E-CF2808BFDEE7}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.GraphQL.Forms", "src\Our.Umbraco.GraphQL.Forms\Our.Umbraco.GraphQL.Forms.csproj", "{F4E59846-A044-439A-B074-9402FA5F474B}"
19-
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2220
Debug|Any CPU = Debug|Any CPU
@@ -34,10 +32,6 @@ Global
3432
{9CC632BF-46A8-4BA6-B51F-CDFF3A935974}.Debug|Any CPU.Build.0 = Debug|Any CPU
3533
{9CC632BF-46A8-4BA6-B51F-CDFF3A935974}.Release|Any CPU.ActiveCfg = Release|Any CPU
3634
{9CC632BF-46A8-4BA6-B51F-CDFF3A935974}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{F4E59846-A044-439A-B074-9402FA5F474B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{F4E59846-A044-439A-B074-9402FA5F474B}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{F4E59846-A044-439A-B074-9402FA5F474B}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{F4E59846-A044-439A-B074-9402FA5F474B}.Release|Any CPU.Build.0 = Release|Any CPU
4135
EndGlobalSection
4236
GlobalSection(SolutionProperties) = preSolution
4337
HideSolutionNode = FALSE
@@ -46,7 +40,6 @@ Global
4640
{C2001952-0774-4BFA-AF30-043B3B16D275} = {D56E0413-4D79-45DF-BECA-09D6732637F5}
4741
{59294783-3A17-479B-90C5-A3A2967176DE} = {BE019E17-BF39-443C-8D62-74940D3B6560}
4842
{9CC632BF-46A8-4BA6-B51F-CDFF3A935974} = {9B941129-D270-4DD7-A43E-CF2808BFDEE7}
49-
{F4E59846-A044-439A-B074-9402FA5F474B} = {BE019E17-BF39-443C-8D62-74940D3B6560}
5043
EndGlobalSection
5144
GlobalSection(ExtensibilityGlobals) = postSolution
5245
SolutionGuid = {E20ED350-4522-4159-8FDC-A80A46E7DD7F}

‎samples/Website/.gitignore‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎samples/Website/Global.asax‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎samples/Website/App_Start/GraphQLComponent.cs‎ renamed to ‎samples/Website/GraphQLComponent.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Web.Hosting;
22
using Our.Umbraco.GraphQL.Web;
33
using Owin;
4-
using Umbraco.Core.Configuration;
5-
using Umbraco.Core.Composing;
6-
using Umbraco.Core;
4+
using Umbraco.Cms.Core.Configuration;
5+
using Umbraco.Cms.Core.Composing;
6+
using Umbraco.Cms.Core;
77
using Umbraco.Web;
88

99
namespace Website

‎samples/Website/Program.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using Microsoft.AspNetCore.Hosting;
2+
using Microsoft.Extensions.Configuration;
3+
using Microsoft.Extensions.Hosting;
4+
using Microsoft.Extensions.Logging;
5+
6+
namespace Umbraco.Cms.Web.UI.NetCore
7+
{
8+
public class Program
9+
{
10+
public static void Main(string[] args)
11+
=> CreateHostBuilder(args)
12+
.Build()
13+
.Run();
14+
15+
public static IHostBuilder CreateHostBuilder(string[] args) =>
16+
Host.CreateDefaultBuilder(args)
17+
.ConfigureLogging(x => x.ClearProviders())
18+
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
19+
}
20+
}

‎samples/Website/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"iisSettings": {
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
5+
"iisExpress": {
6+
"applicationUrl": "http://localhost:5000",
7+
"sslPort": 5001
8+
}
9+
},
10+
"profiles": {
11+
"IIS Express": {
12+
"commandName": "IISExpress",
13+
"launchBrowser": true,
14+
"environmentVariables": {
15+
"ASPNETCORE_ENVIRONMENT": "Development"
16+
}
17+
},
18+
"Website": {
19+
"commandName": "Project",
20+
"environmentVariables": {
21+
"ASPNETCORE_ENVIRONMENT": "Development"
22+
},
23+
"applicationUrl": "https://localhost:5001;http://localhost:5000"
24+
}
25+
}
26+
}

‎samples/Website/Startup.cs‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
using System;
2+
using Microsoft.AspNetCore.Builder;
3+
using Microsoft.AspNetCore.Hosting;
4+
using Microsoft.Extensions.Configuration;
5+
using Microsoft.Extensions.DependencyInjection;
6+
using Umbraco.Cms.Core.DependencyInjection;
7+
using Umbraco.Extensions;
8+
9+
namespace Umbraco.Cms.Web.UI.NetCore
10+
{
11+
public class Startup
12+
{
13+
private readonly IWebHostEnvironment _env;
14+
private readonly IConfiguration _config;
15+
16+
/// <summary>
17+
/// Initializes a new instance of the <see cref="Startup"/> class.
18+
/// </summary>
19+
/// <param name="webHostEnvironment">The Web Host Environment</param>
20+
/// <param name="config">The Configuration</param>
21+
/// <remarks>
22+
/// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337
23+
/// </remarks>
24+
public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config)
25+
{
26+
_env = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment));
27+
_config = config ?? throw new ArgumentNullException(nameof(config));
28+
}
29+
30+
31+
32+
/// <summary>
33+
/// Configures the services
34+
/// </summary>
35+
/// <remarks>
36+
/// This method gets called by the runtime. Use this method to add services to the container.
37+
/// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
38+
/// </remarks>
39+
public void ConfigureServices(IServiceCollection services)
40+
{
41+
#pragma warning disable IDE0022 // Use expression body for methods
42+
services.AddUmbraco(_env, _config)
43+
.AddBackOffice()
44+
.AddWebsite()
45+
.AddComposers()
46+
.Build();
47+
#pragma warning restore IDE0022 // Use expression body for methods
48+
49+
}
50+
51+
/// <summary>
52+
/// Configures the application
53+
/// </summary>
54+
public void Configure(IApplicationBuilder app)
55+
{
56+
app.UseUmbracoBackOffice();
57+
app.UseUmbracoWebsite();
58+
}
59+
}
60+
}

‎samples/Website/Starwars/StarwarsComponent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using Our.Umbraco.GraphQL.Adapters.Types.Resolution;
33
using Our.Umbraco.GraphQL.Types;
4-
using Umbraco.Core;
5-
using Umbraco.Core.Composing;
4+
using Umbraco.Cms.Core;
5+
using Umbraco.Cms.Core.Composing;
66
using Website.Starwars.Data;
77
using Website.Starwars.Schema;
88

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /