Remove .NET Framework as a target framework (OLD)

.gitignore

@@ -201,3 +201,6 @@ source/Calamari.Tests/Some sample text
 
 # CodeRush settings
 .cr/
+
+# This is always built on the build server, so we can just use that one. We just need one in the repo as a signal for the existing build system
+netcoreshim.zip

build/Build.sbom.cs

@@ -32,7 +32,7 @@ partial class Build
         .Requires(() => DependencyTrackUrl)
         .Requires(() => DependencyTrackApiKey)
         .Requires(() => InternalDockerRegistry)
-        .DependsOn(Publish)
+        .DependsOn(PublishCalamariProjects)
         .Executes(async () =>
         {
             ArgumentNullException.ThrowIfNull(Solution, nameof(Solution));

build/CalamariPackageMetadata.cs

@@ -4,17 +4,14 @@ namespace Calamari.Build;
 
 public class CalamariPackageMetadata
 {
-    public CalamariPackageMetadata(Project project, string framework, string? architecture, bool isCrossPlatform)
+    public CalamariPackageMetadata(Project project, string framework, string architecture)
     {
         Project = project;
         Framework = framework;
         Architecture = architecture;
-        IsCrossPlatform = isCrossPlatform;
     }
 
     public Project Project { get; }
     public string Framework { get; }
-    public string? Architecture { get; }
-    public bool IsCrossPlatform { get; }
-
+    public string Architecture { get; }    
 }

build/Frameworks.cs

@@ -4,7 +4,7 @@ namespace Calamari.Build
 {
     public static class Frameworks
     {
-        public const string Net462 = "net462";
         public const string Net60 = "net6.0";
+        public const string Net60Windows = "net6.0-windows";
     }
 }

source/Calamari.Aws/Calamari.Aws.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>1.0.0.0</Version>
-    <OutputType>Exe</OutputType>
     <PlatformTarget>anycpu</PlatformTarget>
     <AssemblyName>Calamari.Aws</AssemblyName>
     <OutputType>Library</OutputType>
@@ -19,7 +18,8 @@
     <ApplicationManifest>Calamari.Aws.exe.manifest</ApplicationManifest>
     <ApplicationIcon />
     <StartupObject />
-    <TargetFrameworks>net462;netstandard2.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
+    <LangVersion>10</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

source/Calamari.Azure/Calamari.Azure.csproj

@@ -6,8 +6,9 @@
         <Authors>Octopus Deploy</Authors>
         <Copyright>Octopus Deploy Pty Ltd</Copyright>
         <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
+        <LangVersion>10</LangVersion>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>8.0</LangVersion>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     <ItemGroup>

source/Calamari.AzureAppService.Tests/Calamari.AzureAppService.Tests.csproj

@@ -1,41 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <RootNamespace>Calamari.AzureAppService.Tests</RootNamespace>
+        <AssemblyName>Calamari.AzureAppService.Tests</AssemblyName>
+        <IsPackable>false</IsPackable>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
+        <LangVersion>10</LangVersion>
+        <TargetFramework>net6.0</TargetFramework>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
 
-  <PropertyGroup>
-    <RootNamespace>Calamari.AzureAppService.Tests</RootNamespace>
-    <AssemblyName>Calamari.AzureAppService.Tests</AssemblyName>
-    <IsPackable>false</IsPackable>
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
-    <LangVersion>8.0</LangVersion>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Azure.Identity" Version="1.13.1"/>
+        <PackageReference Include="Azure.ResourceManager.Resources" Version="1.0.0-preview.2"/>
+        <PackageReference Include="Azure.ResourceManager.Storage" Version="1.1.1"/>
+        <PackageReference Include="NSubstitute" Version="4.2.2"/>
+        <PackageReference Include="nunit" Version="3.13.3"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0"/>
+        <PackageReference Include="Polly" Version="8.3.1"/>
+        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.13.1" />
-    <PackageReference Include="Azure.ResourceManager.Resources" Version="1.0.0-preview.2" />
-    <PackageReference Include="Azure.ResourceManager.Storage" Version="1.1.1" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="Polly" Version="8.3.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Calamari.AzureAppService\Calamari.AzureAppService.csproj"/>
+        <ProjectReference Include="..\Calamari.Testing\Calamari.Testing.csproj"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Calamari.AzureAppService\Calamari.AzureAppService.csproj" />
-    <ProjectReference Include="..\Calamari.Testing\Calamari.Testing.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="sample.1.0.0.war">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="sample4-1.0.0.jar">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="functionapp.1.0.0.zip">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Update="sample.1.0.0.war">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="sample4-1.0.0.jar">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="functionapp.1.0.0.zip">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
 </Project>

source/Calamari.AzureAppService/Calamari.AzureAppService.csproj

@@ -1,35 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <AssemblyName>Calamari.AzureAppService</AssemblyName>
-    <RootNamespace>Calamari.AzureAppService</RootNamespace>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <IsPackable>true</IsPackable>
-    <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
-    <LangVersion>8.0</LangVersion>
-    <NoWarn>NU5104</NoWarn>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2" />
-    <PackageReference Include="Azure.ResourceManager.ResourceGraph" Version="1.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Polly" Version="8.3.1" />
-    <PackageReference Include="SharpCompress" Version="0.37.2" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj" />
-    <ProjectReference Include="..\Calamari.Azure\Calamari.Azure.csproj" />
-    <ProjectReference Include="..\Calamari.Common\Calamari.Common.csproj" />
-  </ItemGroup>
-
+    <PropertyGroup>
+        <AssemblyName>Calamari.AzureAppService</AssemblyName>
+        <RootNamespace>Calamari.AzureAppService</RootNamespace>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <IsPackable>true</IsPackable>
+        <OutputType>Exe</OutputType>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
+        <LangVersion>10</LangVersion>
+        <NoWarn>NU5104</NoWarn>
+        <TargetFramework>net6.0</TargetFramework>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Azure.ResourceManager.AppService" Version="1.0.2"/>
+        <PackageReference Include="Azure.ResourceManager.ResourceGraph" Version="1.0.1"/>
+        <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0"/>
+        <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+        <PackageReference Include="Polly" Version="8.3.1"/>
+        <PackageReference Include="SharpCompress" Version="0.37.2"/>
+        <PackageReference Include="System.Linq.Async" Version="6.0.1"/>
+        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Calamari.CloudAccounts\Calamari.CloudAccounts.csproj"/>
+        <ProjectReference Include="..\Calamari.Azure\Calamari.Azure.csproj"/>
+        <ProjectReference Include="..\Calamari.Common\Calamari.Common.csproj"/>
+    </ItemGroup>
 </Project>

source/Calamari.AzureResourceGroup.Tests/Calamari.AzureResourceGroup.Tests.csproj

@@ -1,52 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>Calamari.AzureResourceGroup.Tests</RootNamespace>
-    <AssemblyName>Calamari.AzureResourceGroup.Tests</AssemblyName>
-    <IsPackable>false</IsPackable>
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="Octopus.Dependencies.AzureCLI" Version="2.41.0" GeneratePathProperty="true" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.25" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" Condition="'$(TargetFramework)' == 'net462'" />
-  </ItemGroup>
-  <Target Name="GetPackageFiles" AfterTargets="ResolveReferences" DependsOnTargets="RunResolvePackageDependencies">
+    <PropertyGroup>
+        <RootNamespace>Calamari.AzureResourceGroup.Tests</RootNamespace>
+        <AssemblyName>Calamari.AzureResourceGroup.Tests</AssemblyName>
+        <IsPackable>false</IsPackable>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
+        <TargetFramework>net6.0</TargetFramework>
+        <LangVersion>10</LangVersion>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    </PropertyGroup>
     <ItemGroup>
-      <Content Include="$(PkgOctopus_Dependencies_AzureCLI)/*.nupkg">
-        <Visible>false</Visible>
-        <Link>Octopus.Dependencies.AzureCLI.nupkg</Link>
-        <Pack>true</Pack>
-        <PackageCopyToOutput>true</PackageCopyToOutput>
-        <PackageFlatten>true</PackageFlatten>
-        <PackagePath>contentFiles/any/any/Octopus.Dependencies.AzureCLI.nupkg</PackagePath>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
+        <PackageReference Include="nunit" Version="3.13.3"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0"/>
+        <PackageReference Include="Octopus.Dependencies.AzureCLI" Version="2.41.0" GeneratePathProperty="true"/>
+        <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.25"/>
     </ItemGroup>
-  </Target>
-  <ItemGroup>
-    <ProjectReference Include="..\Calamari.AzureResourceGroup\Calamari.AzureResourceGroup.csproj" />
-    <ProjectReference Include="..\Calamari.Testing\Calamari.Testing.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Packages\AzureResourceGroup\azure_website_params.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Packages\AzureResourceGroup\azure_website_template.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Packages\AzureResourceGroup\Default.aspx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Packages\Bicep\parameters.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Packages\Bicep\azure_website_template.bicep">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
+    <Target Name="GetPackageFiles" AfterTargets="ResolveReferences" DependsOnTargets="RunResolvePackageDependencies">
+        <ItemGroup>
+            <Content Include="$(PkgOctopus_Dependencies_AzureCLI)/*.nupkg">
+                <Visible>false</Visible>
+                <Link>Octopus.Dependencies.AzureCLI.nupkg</Link>
+                <Pack>true</Pack>
+                <PackageCopyToOutput>true</PackageCopyToOutput>
+                <PackageFlatten>true</PackageFlatten>
+                <PackagePath>contentFiles/any/any/Octopus.Dependencies.AzureCLI.nupkg</PackagePath>
+                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            </Content>
+        </ItemGroup>
+    </Target>
+    <ItemGroup>
+        <ProjectReference Include="..\Calamari.AzureResourceGroup\Calamari.AzureResourceGroup.csproj"/>
+        <ProjectReference Include="..\Calamari.Testing\Calamari.Testing.csproj"/>
+    </ItemGroup>
+    <ItemGroup>
+        <None Update="Packages\AzureResourceGroup\azure_website_params.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Packages\AzureResourceGroup\azure_website_template.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Packages\AzureResourceGroup\Default.aspx">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Packages\Bicep\parameters.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="Packages\Bicep\azure_website_template.bicep">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+</Project>

source/Calamari.AzureResourceGroup/Calamari.AzureResourceGroup.csproj

@@ -2,20 +2,20 @@
     <PropertyGroup>
         <RootNamespace>Calamari.AzureResourceGroup</RootNamespace>
         <AssemblyName>Calamari.AzureResourceGroup</AssemblyName>
-        <LangVersion>8</LangVersion>
+        <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
         <RuntimeIdentifiers>win-x64;linux-x64;osx-x64;linux-arm;linux-arm64</RuntimeIdentifiers>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
+        <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24"/>
         <PackageReference Include="Microsoft.Identity.Client" Version="4.66.2"/>
-        <PackageReference Include="Azure.Identity" Version="1.13.1" />
-        <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.0" />
+        <PackageReference Include="Azure.Identity" Version="1.13.1"/>
+        <PackageReference Include="Azure.ResourceManager.Resources" Version="1.7.0"/>
         <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

source/Calamari.AzureScripting.Tests/AzurePowershellCommandFixture.cs

@@ -20,13 +20,7 @@ class AzurePowerShellCommandFixture
         string? subscriptionId;
 
         static IDeploymentTool AzureCLI = new InPathDeploymentTool("Octopus.Dependencies.AzureCLI", "AzureCLI\\wbin");
-        static IDeploymentTool AzureCmdlets = new BoostrapperModuleDeploymentTool("Octopus.Dependencies.AzureCmdlets",
-                                                                                         new[]
-                                                                                         {
-                                                                                             "Powershell\\Azure.Storage\\4.6.1",
-                                                                                             "Powershell\\Azure\\5.3.0",
-                                                                                             "Powershell",
-                                                                                         });
+
         static readonly CancellationTokenSource CancellationTokenSource = new CancellationTokenSource();
         readonly CancellationToken cancellationToken = CancellationTokenSource.Token;
 
@@ -114,7 +108,6 @@ void AddDefaults(CommandTestBuilderContext context)
             context.Variables.Add(SpecialVariables.Action.Azure.ClientId, clientId);
             context.Variables.Add(SpecialVariables.Action.Azure.Password, clientSecret);
             context.WithTool(AzureCLI);
-            context.WithTool(AzureCmdlets);
         }
     }
 }