From 4c8f8f8d19555ed0b887708f6cbfb964a29fa552 Mon Sep 17 00:00:00 2001
From: Alastair Pitts <alastair.pitts@octopus.com>
Date: Mon, 7 Oct 2024 13:35:12 +1100
Subject: [PATCH] Fix mixed dll versions

---
 .../Calamari.AzureResourceGroup.csproj        |  4 +--
 .../Calamari.AzureWebApp.Tests.csproj         | 25 +++++++++++++++++++
 .../Calamari.CloudAccounts.csproj             |  1 -
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj
index 72bbee5c2..3822c0904 100644
--- a/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj
+++ b/source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj
@@ -12,9 +12,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23"/>
+        <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.17.4-preview" />
+        <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24"/>
         <PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
-        <PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="3.9.0-preview"/>
         <PackageReference Include="Azure.Identity" Version="1.12.0" />
         <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.0" />
         <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
diff --git a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj
index bc767b03a..ecb80b15d 100644
--- a/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj
+++ b/source/Calamari.AzureWebApp.Tests/Calamari.AzureWebApp.Tests.csproj
@@ -37,4 +37,29 @@
     <Target Name="CopyNetCoreShimFilesAfterPublish" AfterTargets="Publish" DependsOnTargets="GetNetCoreShimFiles">
         <Unzip SourceFiles="@(NetCoreShimFiles)" DestinationFolder="$(PublishDir)/netcoreshim" SkipUnchangedFiles="true" Condition="'$(TargetFramework)' == 'net6.0'" />
     </Target>
+  <PropertyGroup>
+    <RootNamespace>Calamari.AzureWebApp.Tests</RootNamespace>
+    <AssemblyName>Calamari.AzureWebApp.Tests</AssemblyName>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+    <LangVersion>8.0</LangVersion>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.38.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.38.1" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.25" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Calamari.AzureWebApp\Calamari.AzureWebApp.csproj" />
+    <ProjectReference Include="..\Calamari.Testing\Calamari.Testing.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Packages\**\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
index fbb951fa6..394fb9a21 100644
--- a/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
+++ b/source/Calamari.CloudAccounts/Calamari.CloudAccounts.csproj
@@ -20,7 +20,6 @@
       <PackageReference Include="Azure.Core" Version="1.43.0" />
       <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
       <PackageReference Include="Microsoft.Identity.Client" Version="4.65.0" />
-      <PackageReference Include="Microsoft.Identity.Client" Version="4.48.1" />
     </ItemGroup>
 
 </Project>