nuget fixes

f2calv · Dec 2, 2024 · 135a872 · 135a872
1 parent 3a06d1d
commit 135a872
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 45 deletions.
diff --git a/CasCap.Api.GooglePhotos.Debug.sln b/CasCap.Api.GooglePhotos.Debug.sln
@@ -24,9 +24,6 @@ Global
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -35,71 +32,36 @@ Global
 		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|x64.ActiveCfg = Release|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|x64.Build.0 = Release|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{2A448BCC-84A1-4512-87B3-2685E40B75C4}.Release|x86.Build.0 = Release|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{943A9741-D29D-455F-917F-95FF428F80FD}.Debug|x86.Build.0 = Debug|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|x64.ActiveCfg = Release|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|x64.Build.0 = Release|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|x86.ActiveCfg = Release|Any CPU
-		{943A9741-D29D-455F-917F-95FF428F80FD}.Release|x86.Build.0 = Release|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Debug|x86.Build.0 = Debug|Any CPU
-		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Release|x64.ActiveCfg = Release|Any CPU
-		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Release|x64.Build.0 = Release|Any CPU
-		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Release|x86.ActiveCfg = Release|Any CPU
-		{A6C54B65-6A2D-4BA9-8A11-6097CC351DA5}.Release|x86.Build.0 = Release|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|x64.Build.0 = Debug|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Debug|x86.Build.0 = Debug|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|x64.ActiveCfg = Release|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|x64.Build.0 = Release|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|x86.ActiveCfg = Release|Any CPU
-		{CACAD45C-8DAF-4E61-B6F3-1C911656DB9D}.Release|x86.Build.0 = Release|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|x64.Build.0 = Release|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{09BB7730-C89F-4978-BA26-99B347ACA7A4}.Release|x86.Build.0 = Release|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Debug|x86.Build.0 = Debug|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|x64.ActiveCfg = Release|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|x64.Build.0 = Release|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7278559-B5D2-4481-8C12-4C9F2516341A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/samples/ConsoleApp/ConsoleApp.csproj b/samples/ConsoleApp/ConsoleApp.csproj
@@ -5,10 +5,6 @@
 	  <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\CasCap.Api.GooglePhotos\CasCap.Api.GooglePhotos.csproj" />
   </ItemGroup>

diff --git a/samples/GenericHost/GenericHost.csproj b/samples/GenericHost/GenericHost.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />

diff --git a/src/CasCap.Api.GooglePhotos.Tests/CasCap.Api.GooglePhotos.Tests.csproj b/src/CasCap.Api.GooglePhotos.Tests/CasCap.Api.GooglePhotos.Tests.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Google.Apis.IAMCredentials.v1" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

diff --git a/src/CasCap.Api.GooglePhotos/CasCap.Api.GooglePhotos.csproj b/src/CasCap.Api.GooglePhotos/CasCap.Api.GooglePhotos.csproj
@@ -26,7 +26,6 @@
 
   <ItemGroup>
     <PackageReference Include="Google.Apis.Auth" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
     <PackageReference Include="MimeTypeMapOfficial" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="System.Linq.Async" />
@@ -36,6 +35,9 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" VersionOverride="8.0.11" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)'=='Debug'">
     <ProjectReference Include="..\..\..\CasCap.Common\src\CasCap.Common.Net\CasCap.Common.Net.csproj" />