Compiling against 9.0.0

andrewmckaskill · andrewmckaskill · commit 3d8d45d23090 · 2022-11-15T11:32:19.000Z
diff --git a/samples/Website/Startup.cs b/samples/Website/Startup.cs
@@ -62,8 +62,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseUmbraco()
                 .WithMiddleware(u =>
                 {
-                    u.WithBackOffice();
-                    u.WithWebsite();
+                    u.UseBackOffice();
+                    u.UseWebsite();
                 })
                 .WithEndpoints(u =>
                 {
diff --git a/samples/Website/Website.csproj b/samples/Website/Website.csproj
@@ -4,8 +4,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="9.0.0-beta003" />
-        <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0-beta003" />
+        <PackageReference Include="Umbraco.Cms" Version="9.0.0" />
+        <PackageReference Include="Umbraco.Cms.SqlCe" Version="9.0.0" />
     </ItemGroup>
 
 
diff --git a/src/Our.Umbraco.GraphQL/Adapters/Examine/Types/SearchResultGraphType.cs b/src/Our.Umbraco.GraphQL/Adapters/Examine/Types/SearchResultGraphType.cs
@@ -1,6 +1,7 @@
 using Examine;
 using GraphQL.Types;
 using Our.Umbraco.GraphQL.Adapters.PublishedContent.Types;
+using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.PublishedCache;
 
@@ -25,7 +26,15 @@ public SearchResultGraphType(IPublishedSnapshotAccessor snapshotAccessor, string
                     if (field == "__NodeId")
                     {
                         Field<PublishedContentInterfaceGraphType>().Name("_ContentNode").Description("The published content associated with the specified __NodeId value")
-                            .Resolve(ctx => int.TryParse(ctx.Source.Id, out var id) ? snapshotAccessor.PublishedSnapshot.Content.GetById(id) : null);
+                            .Resolve(ctx =>
+                             {
+                                 if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+                                 {
+                                     throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+                                 }
+
+                                 return int.TryParse(ctx.Source.Id, out var id) ? publishedSnapshot.Content.GetById(id) : null;
+                             });
                     }
                 }
             }
diff --git a/src/Our.Umbraco.GraphQL/Adapters/PublishedContent/Visitors/PublishedContentVisitor.cs b/src/Our.Umbraco.GraphQL/Adapters/PublishedContent/Visitors/PublishedContentVisitor.cs
@@ -125,7 +125,12 @@ private void CreateContentField<T>(ComplexGraphType<T> query, IComplexGraphType
                 .Bidirectional()
                 .Resolve(ctx =>
                 {
-                    var items = fetch(_publishedSnapshotAccessor.PublishedSnapshot.Content,
+                    if (!_publishedSnapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+                    {
+                        throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+                    }
+
+                    var items = fetch(publishedSnapshot.Content,
                         ctx.GetArgument<string>("culture")).ToList();
 
                     return items.OrderBy(ctx.GetArgument<IEnumerable<OrderBy>>("orderBy"))
diff --git a/src/Our.Umbraco.GraphQL/Composing/FieldMiddlewareCollection.cs b/src/Our.Umbraco.GraphQL/Composing/FieldMiddlewareCollection.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Our.Umbraco.GraphQL.Middleware;
 using Umbraco.Cms.Core.Composing;
@@ -6,7 +7,7 @@ namespace Our.Umbraco.GraphQL.Composing
 {
     public class FieldMiddlewareCollection : BuilderCollectionBase<IFieldMiddleware>
     {
-        public FieldMiddlewareCollection(IEnumerable<IFieldMiddleware> items)
+        public FieldMiddlewareCollection(Func<IEnumerable<IFieldMiddleware>> items)
             : base(items)
         {
         }
diff --git a/src/Our.Umbraco.GraphQL/Composing/GraphVisitorCollection.cs b/src/Our.Umbraco.GraphQL/Composing/GraphVisitorCollection.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Our.Umbraco.GraphQL.Adapters.Visitors;
 using Umbraco.Cms.Core.Composing;
@@ -6,7 +7,7 @@ namespace Our.Umbraco.GraphQL.Composing
 {
     public class GraphVisitorCollection : BuilderCollectionBase<IGraphVisitor>
     {
-        public GraphVisitorCollection(IEnumerable<IGraphVisitor> items)
+        public GraphVisitorCollection(Func<IEnumerable<IGraphVisitor>> items)
             : base(items)
         {
         }
diff --git a/src/Our.Umbraco.GraphQL/Our.Umbraco.GraphQL.csproj b/src/Our.Umbraco.GraphQL/Our.Umbraco.GraphQL.csproj
@@ -39,6 +39,6 @@
     <ItemGroup>
         <PackageReference Include="GraphQL.Server.Transports.AspNetCore.SystemTextJson" Version="5.0.2" />
         <PackageReference Include="GraphQL.Server.Ui.Playground" Version="5.0.2" />
-        <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.0-beta003" />
+        <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Our.Umbraco.GraphQL/Types/PublishedContent/PublishedContentAtRootQuery.cs b/src/Our.Umbraco.GraphQL/Types/PublishedContent/PublishedContentAtRootQuery.cs
@@ -17,14 +17,17 @@ public PublishedContentAtRootQuery(IPublishedSnapshotAccessor snapshotAccessor)
             _snapshotAccessor = snapshotAccessor ?? throw new ArgumentNullException(nameof(snapshotAccessor));
         }
 
-        protected IPublishedSnapshot Snapshot => _snapshotAccessor.PublishedSnapshot;
-        protected IPublishedContentCache Content => Snapshot.Content;
-
+        
         [NonNull, NonNullItem]
         public Connection<IPublishedContent> All(string culture = null, int? first = null, string after = null,
             int? last = null, string before = null, IEnumerable<OrderBy> orderBy = null)
         {
-            var rootContent = Content.GetAtRoot(culture).OrderBy(orderBy).ToList();
+            if (!_snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+
+            var rootContent = publishedSnapshot.Content.GetAtRoot(culture).OrderBy(orderBy).ToList();
             return rootContent.ToConnection(x => x.Key, first, after, last, before, rootContent.Count);
         }
     }
diff --git a/src/Our.Umbraco.GraphQL/Types/PublishedContent/PublishedContentQuery.cs b/src/Our.Umbraco.GraphQL/Types/PublishedContent/PublishedContentQuery.cs
@@ -22,7 +22,12 @@ public IPublishedContent ByUrl([Inject] IPublishedSnapshotAccessor snapshotAcces
 
         private static IPublishedContent GetInternal(IPublishedSnapshotAccessor snapshotAccessor, Func<IPublishedContentCache, IPublishedContent> fetch, string culture)
         {
-            var content = fetch(snapshotAccessor.PublishedSnapshot.Content);
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+
+            var content = fetch(publishedSnapshot.Content);
             if (culture == null || content != null && content.IsInvariantOrHasCulture(culture))
                 return content;
 
diff --git a/test/Our.Umbraco.GraphQL.Tests/Our.Umbraco.GraphQL.Tests.csproj b/test/Our.Umbraco.GraphQL.Tests/Our.Umbraco.GraphQL.Tests.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
     <ItemGroup>
       <PackageReference Include="FluentAssertions" Version="5.8.0" />
-      <PackageReference Include="Microsoft.Owin" Version="4.2.0" />
       <PackageReference Include="NSubstitute" Version="4.2.1" />
       <PackageReference Include="xunit" Version="2.4.1" />
       <PackageReference Include="xunit.runner.console" Version="2.4.1" />
diff --git a/test/Our.Umbraco.GraphQL.Tests/Types/PublishedContent/PublishedContentAtRootQueryTests.cs b/test/Our.Umbraco.GraphQL.Tests/Types/PublishedContent/PublishedContentAtRootQueryTests.cs
@@ -1,6 +1,7 @@
 using FluentAssertions;
 using NSubstitute;
 using Our.Umbraco.GraphQL.Types.PublishedContent;
+using System;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Xunit;
@@ -25,7 +26,11 @@ public void All_WhenCalled_ReturnsRootContent()
             };
 
             var snapshotAccessor = Substitute.For<IPublishedSnapshotAccessor>();
-            snapshotAccessor.PublishedSnapshot.Content.GetAtRoot()
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+            publishedSnapshot.Content.GetAtRoot()
                 .Returns(items);
             var query = CreateSUT(snapshotAccessor);
 
diff --git a/test/Our.Umbraco.GraphQL.Tests/Types/PublishedContent/PublishedContentQueryTests.cs b/test/Our.Umbraco.GraphQL.Tests/Types/PublishedContent/PublishedContentQueryTests.cs
@@ -32,7 +32,11 @@ public void ById_WhenContentExists_ReturnsPublishedContent()
             content.Key.Returns(new Guid("3B1E9E9C-A89E-4FE0-902D-3466D8678E47"));
 
             var snapshotAccessor = Substitute.For<IPublishedSnapshotAccessor>();
-            snapshotAccessor.PublishedSnapshot.Content.GetById(Arg.Is(content.Key))
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+            publishedSnapshot.Content.GetById(Arg.Is(content.Key))
                 .Returns(content);
 
             var actual = query.ById(snapshotAccessor, new Id(content.Key.ToString()));
@@ -47,7 +51,11 @@ public void ById_WhenContentDoesNotExists_ReturnsNull()
             var id = new Guid("3B1E9E9C-A89E-4FE0-902D-3466D8678E47");
 
             var snapshotAccessor = Substitute.For<IPublishedSnapshotAccessor>();
-            snapshotAccessor.PublishedSnapshot.Content.GetById(Arg.Is(id))
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+            publishedSnapshot.Content.GetById(Arg.Is(id))
                 .Returns((IPublishedContent)null);
 
             var actual = query.ById(snapshotAccessor, new Id(id.ToString()));
@@ -74,7 +82,11 @@ public void ByUrl_WhenContentExists_ReturnsPublishedContent()
             content.Key.Returns(new Guid("3B1E9E9C-A89E-4FE0-902D-3466D8678E47"));
 
             var snapshotAccessor = Substitute.For<IPublishedSnapshotAccessor>();
-            snapshotAccessor.PublishedSnapshot.Content.GetByRoute("/")
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+            publishedSnapshot.Content.GetByRoute("/")
                 .Returns(content);
 
             var actual = query.ByUrl(snapshotAccessor, "/");
@@ -88,7 +100,11 @@ public void ByUrl_WhenContentDoesNotExists_ReturnsNull()
             var query = CreateSUT();
 
             var snapshotAccessor = Substitute.For<IPublishedSnapshotAccessor>();
-            snapshotAccessor.PublishedSnapshot.Content.GetByRoute("/")
+            if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))
+            {
+                throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");
+            }
+            publishedSnapshot.Content.GetByRoute("/")
                 .Returns((IPublishedContent)null);
 
             var actual = query.ByUrl(snapshotAccessor, "/");

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`62`	`62`	`app.UseUmbraco()`
`63`	`63`	`.WithMiddleware(u =>`
`64`	`64`	`{`
`65`		`- u.WithBackOffice();`
`66`		`- u.WithWebsite();`
	`65`	`+ u.UseBackOffice();`
	`66`	`+ u.UseWebsite();`
`67`	`67`	`})`
`68`	`68`	`.WithEndpoints(u =>`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using Examine;`
`2`	`2`	`using GraphQL.Types;`
`3`	`3`	`using Our.Umbraco.GraphQL.Adapters.PublishedContent.Types;`
	`4`	`+using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using Umbraco.Cms.Core.PublishedCache;`
`6`	`7`
`@@ -25,7 +26,15 @@ public SearchResultGraphType(IPublishedSnapshotAccessor snapshotAccessor, string`
`25`	`26`	`if (field == "__NodeId")`
`26`	`27`	`{`
`27`	`28`	`Field<PublishedContentInterfaceGraphType>().Name("_ContentNode").Description("The published content associated with the specified __NodeId value")`
`28`		`- .Resolve(ctx => int.TryParse(ctx.Source.Id, out var id) ? snapshotAccessor.PublishedSnapshot.Content.GetById(id) : null);`
	`29`	`+ .Resolve(ctx =>`
	`30`	`+ {`
	`31`	`+ if (!snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))`
	`32`	`+ {`
	`33`	`+ throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ return int.TryParse(ctx.Source.Id, out var id) ? publishedSnapshot.Content.GetById(id) : null;`
	`37`	`+ });`
`29`	`38`	`}`
`30`	`39`	`}`
`31`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Collections.Generic;`
`2`	`3`	`using Our.Umbraco.GraphQL.Middleware;`
`3`	`4`	`using Umbraco.Cms.Core.Composing;`
`@@ -6,7 +7,7 @@ namespace Our.Umbraco.GraphQL.Composing`
`6`	`7`	`{`
`7`	`8`	`public class FieldMiddlewareCollection : BuilderCollectionBase<IFieldMiddleware>`
`8`	`9`	`{`
`9`		`- public FieldMiddlewareCollection(IEnumerable<IFieldMiddleware> items)`
	`10`	`+ public FieldMiddlewareCollection(Func<IEnumerable<IFieldMiddleware>> items)`
`10`	`11`	`: base(items)`
`11`	`12`	`{`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,17 @@ public PublishedContentAtRootQuery(IPublishedSnapshotAccessor snapshotAccessor)`
`17`	`17`	`_snapshotAccessor = snapshotAccessor ?? throw new ArgumentNullException(nameof(snapshotAccessor));`
`18`	`18`	`}`
`19`	`19`
`20`		`- protected IPublishedSnapshot Snapshot => _snapshotAccessor.PublishedSnapshot;`
`21`		`- protected IPublishedContentCache Content => Snapshot.Content;`
`22`		`-`
	`20`	`+`
`23`	`21`	`[NonNull, NonNullItem]`
`24`	`22`	`public Connection<IPublishedContent> All(string culture = null, int? first = null, string after = null,`
`25`	`23`	`int? last = null, string before = null, IEnumerable<OrderBy> orderBy = null)`
`26`	`24`	`{`
`27`		`- var rootContent = Content.GetAtRoot(culture).OrderBy(orderBy).ToList();`
	`25`	`+ if (!_snapshotAccessor.TryGetPublishedSnapshot(out var publishedSnapshot))`
	`26`	`+ {`
	`27`	`+ throw new InvalidOperationException("Wasn't possible to a get a valid Snapshot");`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ var rootContent = publishedSnapshot.Content.GetAtRoot(culture).OrderBy(orderBy).ToList();`
`28`	`31`	`return rootContent.ToConnection(x => x.Key, first, after, last, before, rootContent.Count);`
`29`	`32`	`}`
`30`	`33`	`}`