Updated dependencies and cleaned up

yiangos · Sep 23, 2022 · d206df0 · d206df0
1 parent 510d8bf
commit d206df0
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 68 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
       <PrivateAssets>all</PrivateAssets>
-      <Version>3.5.109</Version>
+      <Version>3.5.113</Version>
     </PackageReference>
 
     <PackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1">

diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj
@@ -11,13 +11,8 @@
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
       <PackageReference Include="NJsonSchema" Version="10.8.0" />
       <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.3.1" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="10.0.0-rc1" />
-      <PackageReference Include="Umbraco.Deploy.Core" Version="9.4.0" />
-      <PackageReference Include="Umbraco.Forms.Core" Version="9.4.0" />
-      <PackageReference Update="Nerdbank.GitVersioning">
-        <Version>3.5.107</Version>
-      </PackageReference>
+      <PackageReference Include="Umbraco.Deploy.Core" Version="10.1.0" />
+      <PackageReference Include="Umbraco.Forms.Core" Version="10.0.0" />
     </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj b/src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj
@@ -12,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.0-rc.1.*" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -15,31 +15,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="6.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0-rc.1.*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
-    <PackageReference Include="System.Runtime.Caching" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Runtime.Caching" Version="7.0.0-rc.*" />
     <PackageReference Include="Umbraco.Code" Version="2.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -20,22 +20,14 @@
       <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
       <PackageReference Include="MailKit" Version="3.4.1" />
       <PackageReference Include="IPNetwork2" Version="2.6.467" />
-      <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
-      <PackageReference Include="MailKit" Version="3.4.1" />
-      <PackageReference Include="IPNetwork2" Version="2.6.467" />
       <PackageReference Include="Markdown" Version="2.2.1" />
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
       <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-preview.7.22375.6" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0-preview.7.22375.6" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0-preview.7.22375.6" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0-preview.7.22375.6" />
-      <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0-preview.7.22375.6" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.5" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0-rc.1.*" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0-rc.1.*" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0-rc.1.*" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0-rc.1.*" />
+      <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.0-rc.1.*" />
       <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -57,18 +49,13 @@
       <PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
       <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
       <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-      <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.7.22375.6" /> <!-- Explicit updated this nested dependency due to this https://github.com/dotnet/announcements/issues/178-->
-      <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0-preview.7.22375.6" />
+      <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-rc.1.*" /> <!-- Explicit updated this nested dependency due to this https://github.com/dotnet/announcements/issues/178-->
+      <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0-rc.1.*" />
       <PackageReference Include="Examine.Core" Version="3.0.1" />
       <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.1" />
-      <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" /> <!-- Explicit updated this nested dependency due to this https://github.com/dotnet/announcements/issues/178-->
-      <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
       <PackageReference Include="Umbraco.Code" Version="2.0.0">
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Update="Nerdbank.GitVersioning">
-        <Version>3.5.107</Version>
-      </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -28,9 +28,6 @@
       <PackageReference Include="Umbraco.Code" Version="2.0.0">
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Update="Nerdbank.GitVersioning">
-        <Version>3.5.107</Version>
-      </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -35,12 +35,8 @@
 
   <ItemGroup>
     <PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.7.22376.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.7.22376.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.0-rc.1.*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.7.22376.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-rc.*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -35,9 +35,6 @@
       <PackageReference Include="Umbraco.Code" Version="2.0.0">
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Update="Nerdbank.GitVersioning">
-        <Version>3.5.107</Version>
-      </PackageReference>
     </ItemGroup>
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">

diff --git a/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -26,7 +26,7 @@
       <Version>0.13.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug">
-      <Version>7.0.0-preview.7.22375.6</Version>
+      <Version>7.0.0-rc.1.*</Version>
     </PackageReference>
     <PackageReference Include="Moq">
       <Version>4.18.1</Version>

diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -85,11 +85,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0-rc.1.*" />
     <PackageReference Include="Examine.Lucene" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Bogus" Version="34.0.2" />
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />

diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -23,12 +23,11 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.17.1" />
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="System.Data.Odbc" Version="7.0.0-preview.7.22375.6" />
-    <PackageReference Include="System.Data.OleDb" Version="7.0.0-preview.7.22375.6" />
+    <PackageReference Include="System.Data.Odbc" Version="7.0.0-rc.1.*" />
+    <PackageReference Include="System.Data.OleDb" Version="7.0.0-rc.1.*" />
   </ItemGroup>
 
   <ItemGroup>