Ocelot.Testing package reference

Author: raman-m

Ocelot.Administration.IdentityServer4.sln

@@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Administration.Ident
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Administration.IdentityServer4.AcceptanceTests", "acceptance\Ocelot.Administration.IdentityServer4.AcceptanceTests.csproj", "{E153AF87-77DE-421F-86BC-3E5B4A72956D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot", "..\Ocelot\src\Ocelot\Ocelot.csproj", "{76A4A34F-8799-F712-3EC2-37304A41F110}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Testing", "..\Ocelot\test\Ocelot.Testing\Ocelot.Testing.csproj", "{FF7A4C4B-3F30-B61E-7981-F3C27656CAD9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -37,14 +33,6 @@ Global
 		{E153AF87-77DE-421F-86BC-3E5B4A72956D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E153AF87-77DE-421F-86BC-3E5B4A72956D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E153AF87-77DE-421F-86BC-3E5B4A72956D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76A4A34F-8799-F712-3EC2-37304A41F110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76A4A34F-8799-F712-3EC2-37304A41F110}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76A4A34F-8799-F712-3EC2-37304A41F110}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76A4A34F-8799-F712-3EC2-37304A41F110}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF7A4C4B-3F30-B61E-7981-F3C27656CAD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF7A4C4B-3F30-B61E-7981-F3C27656CAD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF7A4C4B-3F30-B61E-7981-F3C27656CAD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF7A4C4B-3F30-B61E-7981-F3C27656CAD9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

acceptance/Ocelot.Administration.IdentityServer4.AcceptanceTests.csproj

@@ -15,7 +15,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Ocelot\test\Ocelot.Testing\Ocelot.Testing.csproj" />
     <ProjectReference Include="..\src\Ocelot.Administration.IdentityServer4.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -33,14 +32,15 @@
     </PackageReference>
     <PackageReference Include="CacheManager.Serialization.Json" Version="2.0.0" />
     <PackageReference Include="Ocelot.Cache.CacheManager" Version="24.0.0" />
+    <PackageReference Include="Ocelot.Testing" Version="24.0.0" />
   </ItemGroup>
   <!-- Conditionally obtain references for the net 8.0 target -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.16" />
   </ItemGroup>
   <!-- Conditionally obtain references for the net 9.0 target -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.5" />
   </ItemGroup>
 
   <ItemGroup>

src/Ocelot.Administration.IdentityServer4.csproj

@@ -5,9 +5,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <VersionPrefix>23.4</VersionPrefix>
-    <Version>23.4.3</Version>
-    <AssemblyVersion>23.4.3</AssemblyVersion>
+    <VersionPrefix>24.0</VersionPrefix>
+    <Version>24.0.0</Version>
     <Copyright>Three Mammals</Copyright>
     <Product>Ocelot</Product>
     <Authors>Tom Pallister, Raman Maksimchuk</Authors>
@@ -21,12 +20,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<PackageReference Include="Ocelot" Version="24.0.0" />-->
+    <PackageReference Include="Ocelot" Version="24.0.0" />
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Ocelot\src\Ocelot\Ocelot.csproj" />
-  </ItemGroup>
 </Project>

unit/Ocelot.Administration.IdentityServer4.UnitTests.csproj

@@ -15,22 +15,23 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="Ocelot.Testing" Version="24.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Ocelot\test\Ocelot.Testing\Ocelot.Testing.csproj" />
     <ProjectReference Include="..\src\Ocelot.Administration.IdentityServer4.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Using Include="Xunit" />
     <Using Include="Moq" />
+    <Using Include="Xunit" />
+    <Using Include="Ocelot.Testing" />
   </ItemGroup>
 
 </Project>