Merge pull request #464 from MindscapeHQ/darcy/APL-188

Darcy/apl 188

.gitignore

@@ -179,3 +179,4 @@ pip-log.txt
 xpkg
 *.xam
 .idea/
+to-upload/

Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj

@@ -9,7 +9,7 @@
     <Authors>Raygun</Authors>
     <Description>.NetStandard library for targeting ASP.Net Core applications</Description>
     <PackageId>Mindscape.Raygun4Net.AspNetCore</PackageId>
-    <PackageVersion>6.6.4</PackageVersion>
+    <PackageVersion>6.6.5</PackageVersion>
     <PackageProjectUrl>https://github.com/MindscapeHQ/raygun4net</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> 
     <PackageLicenseFile>LICENSE</PackageLicenseFile>

Mindscape.Raygun4Net.AspNetCore/Properties/AssemblyVersionInfo.cs

@@ -10,5 +10,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.6.4")]
-[assembly: AssemblyFileVersion("6.6.4")]
+[assembly: AssemblyVersion("6.6.5")]
+[assembly: AssemblyFileVersion("6.6.5")]

Mindscape.Raygun4Net.AspNetCore/README.md

@@ -13,7 +13,7 @@ The main classes can be found in the Mindscape.Raygun4Net namespace.
 Usage
 ======
 
-In your project.json file, add "Mindscape.Raygun4Net.AspNetCore": "6.6.4" to your dependencies.
+In your project.json file, add "Mindscape.Raygun4Net.AspNetCore": "6.6.5" to your dependencies.
 
 Run dotnet.exe restore or restore packages within Visual Studio to download the package.
 

Mindscape.Raygun4Net.NetCore.Tests/Mindscape.Raygun4Net.NetCore.Tests.csproj

@@ -1,6 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <!--Out of support versions which still compiles/works @ May 2022-->
+    <!--You may need to install extra SDK/Targeting packs to run these tests -->
+    <TargetFrameworks>netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;netcoreapp2.0;netcoreapp1.1;netcoreapp1.0;net461;</TargetFrameworks>
+
+    <!-- Versions which are supported by Microsoft @ May 2022-->
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net48;net472;net471;net47;net462</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Configurations>Debug;Release;Sign</Configurations>

buildNetCore.ps1

@@ -2,6 +2,7 @@ properties {
     $root =                             $psake.build_script_dir
     $configuration =                    "Release"
     $build_dir =                        "$root\build\"
+    $build_dir_upload =                 "$root\to-upload"
     $build_dir_net_core =               "$build_dir\netcore"
     $build_dir_aspnet_core  =           "$build_dir\asp-netcore"
     $build_dir_net_core_common  =       "$build_dir\netcore-common"
@@ -17,6 +18,7 @@ properties {
 task default -depends Compile
 
 task Clean {
+    remove-item -force -recurse $build_dir_upload -ErrorAction SilentlyContinue | Out-Null
     remove-item -force -recurse $build_dir_net_core -ErrorAction SilentlyContinue | Out-Null
     remove-item -force -recurse $build_dir_aspnet_core -ErrorAction SilentlyContinue | Out-Null
     remove-item -force -recurse $build_dir_net_core_common -ErrorAction SilentlyContinue | Out-Null
@@ -32,7 +34,8 @@ task Init -depends Clean {
     new-item $build_dir_signed_net_core -itemType directory | Out-Null
     new-item $build_dir_signed_net_core_common -itemType directory | Out-Null
     new-item $build_dir_signed_aspnet_core -itemType directory | Out-Null
-
+
+    New-Item -ItemType Directory -Force -Path $build_dir_upload\ | Out-Null
     New-Item -ItemType Directory -Force -Path $root\Mindscape.Raygun4Net.NetCore.Common\build\NetCoreCommon\ | Out-Null
     New-Item -ItemType Directory -Force -Path $root\Mindscape.Raygun4Net.NetCore\build\NetCore\ | Out-Null
     New-Item -ItemType Directory -Force -Path $root\Mindscape.Raygun4Net.AspNetCore\build\AspNetCore\ | Out-Null
@@ -42,13 +45,13 @@ task Init -depends Clean {
 }
 
 task Compile -depends Init {    
-    exec { dotnet pack .\Mindscape.Raygun4Net.NetCore.Common\ --output build\NetCoreCommon --configuration Release }
+    exec { dotnet pack .\Mindscape.Raygun4Net.NetCore.Common\ --output build\NetCoreCommon --configuration $configuration }
     move-item -Path $root\Mindscape.Raygun4Net.NetCore.Common\build\NetCoreCommon\* -Destination $build_dir_net_core_common
 
-    exec { dotnet pack .\Mindscape.Raygun4Net.NetCore\ --output build\NetCore --configuration Release }
+    exec { dotnet pack .\Mindscape.Raygun4Net.NetCore\ --output build\NetCore --configuration Rele$configurationase }
     move-item -Path $root\Mindscape.Raygun4Net.NetCore\build\NetCore\* -Destination $build_dir_net_core
 
-    exec { dotnet pack .\Mindscape.Raygun4Net.AspNetCore\ --output build\AspNetCore --configuration Release }
+    exec { dotnet pack .\Mindscape.Raygun4Net.AspNetCore\ --output build\AspNetCore --configuration $configuration }
     move-item -Path $root\Mindscape.Raygun4Net.AspNetCore\build\AspNetCore\* -Destination $build_dir_aspnet_core
 
     # Signed
@@ -62,4 +65,13 @@ task Compile -depends Init {
     # Signed
     exec { dotnet pack .\Mindscape.Raygun4Net.AspNetCore\ --output build\Signed\AspNetCore --configuration Sign }
     move-item -Path $root\Mindscape.Raygun4Net.AspNetCore\build\Signed\AspNetCore\* -Destination $build_dir_signed_aspnet_core
+
+    # Move all of the packages into one directory
+    Copy-Item -Path $build_dir -Destination $build_dir_upload -Recurse -Container:$false -Force 
+
+    #Tidy up empty directories (artifacts)
+    Get-ChildItem $build_dir_upload -Recurse -Force -Directory | 
+    Sort-Object -Property FullName -Descending |
+    Where-Object { $($_ | Get-ChildItem -Force | Select-Object -First 1).Count -eq 0 } |
+    Remove-Item -Verbose
 }