Merge pull request #69 from OctopusDeploy/michaelnoonan/target-net452

Changed targeting from .NET 4.5.1 to .NET 4.5.2
OctopusDeploy · Apr 17, 2020 · eacbe91 · eacbe91
2 parents ed1b1d8 + d228801
commit eacbe91
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git a/BuildAssets/OctopusTools.nuspec b/BuildAssets/OctopusTools.nuspec
@@ -15,9 +15,10 @@
     <releaseNotes></releaseNotes>
     <language>en-US</language>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/OctopusDeploy/OctopusCLI/blob/master/LICENSE.txt</licenseUrl>
+    <license type="expression">Apache-2.0</license>
     <projectUrl>https://github.com/OctopusDeploy/OctopusCLI/</projectUrl>
-    <iconUrl>http://i.octopusdeploy.com/resources/Avatar3_360.png</iconUrl>
+    <repository type="git" url="https://github.com/OctopusDeploy/OctopusClients" />
+    <icon>tools\icon.png</icon>
     <tags>automation deployment</tags>
     <developmentDependency>true</developmentDependency>
   </metadata>

diff --git a/BuildAssets/icon.png b/BuildAssets/icon.png
diff --git a/build.cake b/build.cake
@@ -132,7 +132,7 @@ Task("DotnetPublish")
 {
     DotNetCorePublish(projectToPublish, new DotNetCorePublishSettings
     {
-        Framework = "net451",
+        Framework = "net452",
         Configuration = configuration,
         OutputDirectory = $"{octoPublishFolder}/netfx",
         ArgumentCustomization = args => args.Append($"/p:Version={nugetVersion}")
@@ -232,6 +232,7 @@ Task("PackOctopusToolsNuget")
         var nuspecFile = "OctopusTools.nuspec";
 
         CopyDirectory($"{octoPublishFolder}/win-x64", nugetPackDir);
+        CopyFileToDirectory($"{assetDir}/icon.png", nugetPackDir);
         CopyFileToDirectory($"{assetDir}/LICENSE.txt", nugetPackDir);
         CopyFileToDirectory($"{assetDir}/VERIFICATION.txt", nugetPackDir);
         CopyFileToDirectory($"{assetDir}/init.ps1", nugetPackDir);

diff --git a/source/Octo.Tests/Octo.Tests.csproj b/source/Octo.Tests/Octo.Tests.csproj
@@ -29,7 +29,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Nancy" Version="2.0.0-clinteastwood" />
-    <PackageReference Include="Octopus.Client" Version="8.2.0" />
+    <PackageReference Include="Octopus.Client" Version="8.4.2" />
     <PackageReference Include="Serilog.Sinks.TextWriter" Version="2.0.0" />
     <PackageReference Include="NSubstitute" Version="4.2.1" />
     <PackageReference Include="FluentAssertions" Version="4.19.4" />

diff --git a/source/Octo/Octo.csproj b/source/Octo/Octo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">net451;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">net452;netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSUnixLike())">netcoreapp2.0;netcoreapp3.1</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>portable</DebugType>
@@ -21,7 +21,7 @@
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <PlatformTarget>anycpu32bitpreferred</PlatformTarget>
   </PropertyGroup>
 

diff --git a/source/Octopus.Cli/Octopus.Cli.csproj b/source/Octopus.Cli/Octopus.Cli.csproj
@@ -1,16 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">net451;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks Condition="!$([MSBuild]::IsOSUnixLike())">net452;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSUnixLike())">netstandard2.0</TargetFrameworks>
-    <PackageId>Octopus.Cli</PackageId>
     <Authors>Octopus Deploy</Authors>
     <Copyright>Octopus Deploy Pty Ltd</Copyright>
-    <PackageIconUrl>http://i.octopusdeploy.com/resources/Avatar3-32x32.png</PackageIconUrl>
-    <PackageProjectUrl>http://octopusdeploy.com/</PackageProjectUrl>
-    <PackageLicenseUrl>http://octopusdeploy.com/pricing</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/OctopusDeploy/OctopusCli</RepositoryUrl>
     <Description>Octopus Deploy is an automated release management tool for modern developers and DevOps teams.
 
       This package contains the .NET CLI library for interacting with the HTTP API in Octopus.</Description>
@@ -33,7 +27,7 @@
     <PackageReference Include="NuGet.Packaging.Core" Version="3.6.0-octopus-58692" />
     <PackageReference Include="NuGet.Packaging.Core.Types" Version="3.6.0-octopus-58692" />
     <PackageReference Include="NuGet.Versioning" Version="3.6.0-octopus-58692" />
-    <PackageReference Include="Octopus.Client" Version="8.2.0" />
+    <PackageReference Include="Octopus.Client" Version="8.4.2" />
     <PackageReference Include="Octostache" Version="2.3.0" />
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.0.0" />

diff --git a/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj b/source/Octopus.DotNet.Cli/Octopus.DotNet.Cli.csproj
@@ -9,7 +9,6 @@
     <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <PackAsTool>True</PackAsTool>
     <AssemblyName>dotnet-octo</AssemblyName>
-
     <PackageId>Octopus.DotNet.Cli</PackageId>
     <Authors>Octopus Deploy</Authors>
     <Copyright>Octopus Deploy Pty Ltd</Copyright>