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

Fixed Icons, license, and .Net versions supported
MindscapeHQ · Feb 28, 2022 · b9ee903 · b9ee903
2 parents 94235f7 + fcc4db9
commit b9ee903
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 32 deletions.
diff --git a/128x128-transparent.png b/128x128-transparent.png
diff --git a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Configurations>Debug;Release;Sign</Configurations>
     <Platforms>AnyCPU</Platforms>
@@ -9,24 +9,31 @@
     <Authors>Raygun</Authors>
     <Description>.NetStandard library for targeting ASP.Net Core applications</Description>
     <PackageId>Mindscape.Raygun4Net.AspNetCore</PackageId>
-    <PackageVersion>6.6.3</PackageVersion>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://github.com/MindscapeHQ/raygun4net/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageVersion>6.6.4</PackageVersion>
     <PackageProjectUrl>https://github.com/MindscapeHQ/raygun4net</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> 
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</PackageIconUrl>
+    <PackageIcon>128x128-transparent.png</PackageIcon>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\128x128-transparent.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>  
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Mindscape.Raygun4Net\Filters\IRaygunDataFilter.cs" Link="Filters\IRaygunDataFilter.cs" />
@@ -44,4 +51,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">   
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
 </Project>
diff --git 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.3")]
-[assembly: AssemblyFileVersion("6.6.3")]
+[assembly: AssemblyVersion("6.6.4")]
+[assembly: AssemblyFileVersion("6.6.4")]
diff --git 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.3" to your dependencies.
+In your project.json file, add "Mindscape.Raygun4Net.AspNetCore": "6.6.4" to your dependencies.
 
 Run dotnet.exe restore or restore packages within Visual Studio to download the package.
 

diff --git a/Mindscape.Raygun4Net.NetCore.Common/Messages/RaygunClientMessage.cs b/Mindscape.Raygun4Net.NetCore.Common/Messages/RaygunClientMessage.cs
@@ -5,7 +5,7 @@ public class RaygunClientMessage
     public RaygunClientMessage()
     {
       Name = "Raygun4Net.NetCore";
-      Version = "6.5.2";
+      Version = "6.5.3";
       ClientUrl = @"https://github.com/MindscapeHQ/raygun4net";
     }
 

diff --git a/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj b/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj
@@ -1,25 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <Configurations>Debug;Release;Sign</Configurations>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <PropertyGroup>
     <Authors>Raygun</Authors>
     <Description>.NetStandard library .NetCore applications</Description>
     <PackageId>Mindscape.Raygun4Net.NetCore.Common</PackageId>
-    <PackageVersion>6.5.2</PackageVersion>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://github.com/MindscapeHQ/raygun4net/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageVersion>6.5.3</PackageVersion>
     <PackageProjectUrl>https://github.com/MindscapeHQ/raygun4net</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> 
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</PackageIconUrl>
+    <PackageIcon>128x128-transparent.png</PackageIcon>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <PackageId>Mindscape.Raygun4Net.NetCore.Common.Signed</PackageId>
     <AssemblyOriginatorKeyFile>Raygun4Net.NetCore.Common.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <Optimize>true</Optimize>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\128x128-transparent.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>  
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6'">
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.StackTrace" Version="4.0.1" />

diff --git a/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj b/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj
@@ -3,7 +3,7 @@
     <RootNamespace>Mindscape.Raygun4Net.NetCore</RootNamespace>
     <AssemblyName>Mindscape.Raygun4Net.NetCore</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFrameworks>netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Configurations>Debug;Release;Sign</Configurations>
     <Platforms>AnyCPU</Platforms>
@@ -13,12 +13,17 @@
     <Authors>Raygun</Authors>
     <Description>.NetStandard library for targeting .Net Core applications</Description>
     <PackageId>Mindscape.Raygun4Net.NetCore</PackageId>
-    <PackageVersion>6.4.2</PackageVersion>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://github.com/MindscapeHQ/raygun4net/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageVersion>6.4.3</PackageVersion>
     <PackageProjectUrl>https://github.com/MindscapeHQ/raygun4net</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</PackageIconUrl>
+    <PackageIcon>128x128-transparent.png</PackageIcon>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\128x128-transparent.png" Pack="true" PackagePath="\"/>
+  </ItemGroup>  
   <ItemGroup>
     <Compile Include="RaygunClient.cs" />
     <Compile Include="RaygunSettings.cs" />

diff --git a/Mindscape.Raygun4Net.NetCore/Properties/AssemblyVersionInfo.cs b/Mindscape.Raygun4Net.NetCore/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.4.2")]
-[assembly: AssemblyFileVersion("6.4.2")]
+[assembly: AssemblyVersion("6.4.3")]
+[assembly: AssemblyFileVersion("6.4.3")]
diff --git a/Mindscape.Raygun4Net.NetCore/README.md b/Mindscape.Raygun4Net.NetCore/README.md
@@ -13,7 +13,7 @@ The main classes can be found in the Mindscape.Raygun4Net namespace.
 Usage
 =====
 
-In your project file, add "Mindscape.Raygun4Net.NetCore": "6.4.2" to your dependencies.
+In your project file, add "Mindscape.Raygun4Net.NetCore": "6.4.3" to your dependencies.
 
 Run dotnet.exe restore or restore packages within Visual Studio to download the package.
 

diff --git a/Mindscape.Raygun4Net4/RaygunClient.cs b/Mindscape.Raygun4Net4/RaygunClient.cs
@@ -46,10 +46,7 @@ public class RaygunClient : RaygunClientBase
     /// Initializes a new instance of the <see cref="RaygunClient" /> class.
     /// Uses the ApiKey specified in the config file.
     /// </summary>
-    public RaygunClient()
-      : this(RaygunSettings.Settings.ApiKey)
-    {
-    }
+    public RaygunClient() : this(RaygunSettings.Settings.ApiKey) { }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="RaygunClient" /> class.
@@ -266,7 +263,7 @@ public void AddRawDataFilter(IRaygunDataFilter filter)
 
     public static void RecordBreadcrumb(string message)
     {
-      _breadcrumbs.Record(new RaygunBreadcrumb {Message = message});
+      _breadcrumbs.Record(new RaygunBreadcrumb { Message = message });
     }
 
     public static void RecordBreadcrumb(RaygunBreadcrumb crumb)
@@ -289,7 +286,7 @@ public static void ClearBreadcrumbs()
     /// <param name="exception">The exception to deliver.</param>
     public override void Send(Exception exception)
     {
-      Send(exception, null, (IDictionary) null, null);
+      Send(exception, null, (IDictionary)null, null);
     }
 
     /// <summary>
@@ -300,7 +297,7 @@ public override void Send(Exception exception)
     /// <param name="tags">A list of strings associated with the message.</param>
     public void Send(Exception exception, IList<string> tags)
     {
-      Send(exception, tags, (IDictionary) null, null);
+      Send(exception, tags, (IDictionary)null, null);
     }
 
     /// <summary>
@@ -343,7 +340,7 @@ public void Send(Exception exception, IList<string> tags, IDictionary userCustom
     /// <param name="exception">The exception to deliver.</param>
     public void SendInBackground(Exception exception)
     {
-      SendInBackground(exception, null, (IDictionary) null, null);
+      SendInBackground(exception, null, (IDictionary)null, null);
     }
 
     /// <summary>
@@ -353,7 +350,7 @@ public void SendInBackground(Exception exception)
     /// <param name="tags">A list of strings associated with the message.</param>
     public void SendInBackground(Exception exception, IList<string> tags)
     {
-      SendInBackground(exception, tags, (IDictionary) null, null);
+      SendInBackground(exception, tags, (IDictionary)null, null);
     }
 
     /// <summary>