diff --git a/src/Cogworks.AzureSearch/src/Cogworks.AzureSearch.csproj b/src/Cogworks.AzureSearch/src/Cogworks.AzureSearch.csproj index b51585f..ebe55a7 100644 --- a/src/Cogworks.AzureSearch/src/Cogworks.AzureSearch.csproj +++ b/src/Cogworks.AzureSearch/src/Cogworks.AzureSearch.csproj @@ -19,7 +19,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Cogworks.AzureSearch/tests/UnitTests/Cogworks.AzureSearch.UnitTests/Cogworks.AzureSearch.UnitTests.csproj b/src/Cogworks.AzureSearch/tests/UnitTests/Cogworks.AzureSearch.UnitTests/Cogworks.AzureSearch.UnitTests.csproj index cebf0ed..b1b3fb7 100644 --- a/src/Cogworks.AzureSearch/tests/UnitTests/Cogworks.AzureSearch.UnitTests/Cogworks.AzureSearch.UnitTests.csproj +++ b/src/Cogworks.AzureSearch/tests/UnitTests/Cogworks.AzureSearch.UnitTests/Cogworks.AzureSearch.UnitTests.csproj @@ -18,27 +18,30 @@ - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 8f71370..27171de 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -29,6 +29,11 @@ false + + disable + disable + + disable disable @@ -40,7 +45,7 @@ - + diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/src/Cogworks.AzureSearch.IoC.Autofac.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/src/Cogworks.AzureSearch.IoC.Autofac.csproj index 9f02bd5..eac3cd8 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/src/Cogworks.AzureSearch.IoC.Autofac.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/src/Cogworks.AzureSearch.IoC.Autofac.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/tests/UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/tests/UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests.csproj index 77a24b8..077a678 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/tests/UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Autofac/tests/UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests/Cogworks.AzureSearch.IoC.Autofac.UnitTests.csproj @@ -6,29 +6,32 @@ - - - - - - + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/src/Cogworks.AzureSearch.IoC.LightInject.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/src/Cogworks.AzureSearch.IoC.LightInject.csproj index af88ea7..6beca81 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/src/Cogworks.AzureSearch.IoC.LightInject.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/src/Cogworks.AzureSearch.IoC.LightInject.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/tests/UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/tests/UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests.csproj index 448e35b..a69176a 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/tests/UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.LightInject/tests/UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests/Cogworks.AzureSearch.IoC.LightInject.UnitTests.csproj @@ -6,28 +6,31 @@ - - - - + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/src/Cogworks.AzureSearch.IoC.Microsoft.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/src/Cogworks.AzureSearch.IoC.Microsoft.csproj index 0c94e4f..f03aef1 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/src/Cogworks.AzureSearch.IoC.Microsoft.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/src/Cogworks.AzureSearch.IoC.Microsoft.csproj @@ -16,8 +16,8 @@ - - + + \ No newline at end of file diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/tests/UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/tests/UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests.csproj index 5fef267..908cf09 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/tests/UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Microsoft/tests/UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests/Cogworks.AzureSearch.IoC.Microsoft.UnitTests.csproj @@ -6,29 +6,32 @@ - - - - + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/src/Cogworks.AzureSearch.IoC.Umbraco.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/src/Cogworks.AzureSearch.IoC.Umbraco.csproj index be26328..e7c7cc3 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/src/Cogworks.AzureSearch.IoC.Umbraco.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/src/Cogworks.AzureSearch.IoC.Umbraco.csproj @@ -1,11 +1,11 @@  - net6.0;net5.0 + net8.0 . Cogworks.AzureSearch.IoC.Umbraco Cogworks.AzureSearch.IoC.Umbraco An Umbraco extension to Cogworks.AzureSearch. - An Umbraco 9 extension to Cogworks.AzureSearch + An Umbraco 13 extension to Cogworks.AzureSearch Azure Search Umbraco container IoC Apache-2.0 @@ -14,12 +14,12 @@ - + - + - + \ No newline at end of file diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj index 4d810cf..7b9173b 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj @@ -4,7 +4,7 @@ - net6.0;net5.0 + net8.0 latest 1591;1701;1702;8032;NU1701;AD0001;CA1041;CS0311;CS5001 false @@ -19,27 +19,28 @@ true true true - - - disable disable - - + + - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -48,5 +49,5 @@ - + \ No newline at end of file diff --git a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs index def931f..37529f0 100644 --- a/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs +++ b/src/IoC.Providers/Cogworks.AzureSearch.IoC.Umbraco/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs @@ -1,8 +1,5 @@ // ReSharper disable PossibleNullReferenceException - using System; -using System.IO; -using System.Reflection; using Azure.Search.Documents.Indexes.Models; using Cogworks.AzureSearch.Interfaces.Builder; using Cogworks.AzureSearch.Interfaces.Indexes; @@ -18,10 +15,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NSubstitute; -using Umbraco.Cms.Core.Cache; using Umbraco.Cms.Core.Composing; using Umbraco.Cms.Core.DependencyInjection; -using Umbraco.Cms.Core.Logging; using Xunit; namespace Cogworks.AzureSearch.IoC.Umbraco.UnitTests @@ -38,19 +33,11 @@ public class UmbracoIocExtensionTests public UmbracoIocExtensionTests() { - _serviceCollection = new ServiceCollection(); - var dirName = Path.GetDirectoryName( - Assembly.GetExecutingAssembly() - .Location - .Replace("bin\\Debug", string.Empty)) ?? string.Empty; + _serviceCollection = []; var typeLoader = new TypeLoader( Substitute.For(), - new VaryingRuntimeHash(), - Substitute.For(), - new DirectoryInfo(dirName), - Substitute.For>(), - Substitute.For()); + Substitute.For>()); _umbracoBuilder = new UmbracoBuilder( _serviceCollection,