diff --git a/.gitignore b/.gitignore index cae98aa37..15275f1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -179,3 +179,4 @@ pip-log.txt xpkg *.xam .idea/ +to-upload/ diff --git a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj index ae00a6dca..8a498ed52 100644 --- a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj +++ b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj @@ -9,7 +9,7 @@ Raygun .NetStandard library for targeting ASP.Net Core applications Mindscape.Raygun4Net.AspNetCore - 6.6.4 + 6.6.5 https://github.com/MindscapeHQ/raygun4net false LICENSE diff --git a/Mindscape.Raygun4Net.AspNetCore/Properties/AssemblyVersionInfo.cs b/Mindscape.Raygun4Net.AspNetCore/Properties/AssemblyVersionInfo.cs index cba6aef29..592abbf41 100644 --- a/Mindscape.Raygun4Net.AspNetCore/Properties/AssemblyVersionInfo.cs +++ b/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")] diff --git a/Mindscape.Raygun4Net.AspNetCore/README.md b/Mindscape.Raygun4Net.AspNetCore/README.md index 47e27adbc..f00109ee8 100644 --- a/Mindscape.Raygun4Net.AspNetCore/README.md +++ b/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. diff --git a/Mindscape.Raygun4Net.NetCore.Tests/Mindscape.Raygun4Net.NetCore.Tests.csproj b/Mindscape.Raygun4Net.NetCore.Tests/Mindscape.Raygun4Net.NetCore.Tests.csproj index ae63500d1..dcee92df9 100644 --- a/Mindscape.Raygun4Net.NetCore.Tests/Mindscape.Raygun4Net.NetCore.Tests.csproj +++ b/Mindscape.Raygun4Net.NetCore.Tests/Mindscape.Raygun4Net.NetCore.Tests.csproj @@ -1,6 +1,11 @@  - netcoreapp2.0 + + + netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;netcoreapp2.0;netcoreapp1.1;netcoreapp1.0;net461; + + + net6.0;net5.0;netcoreapp3.1;net48;net472;net471;net47;net462 false false Debug;Release;Sign diff --git a/buildNetCore.ps1 b/buildNetCore.ps1 index 565b6eff1..84ba5b6ad 100644 --- a/buildNetCore.ps1 +++ b/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 } \ No newline at end of file