Version 5.0.4 (#621)

NLog · Sep 1, 2022 · ba5855f · ba5855f
1 parent c25b82f
commit ba5855f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -2,6 +2,12 @@
 
 Date format: (year/month/day)
 
+### Version 5.0.4 (2022/09/01)
+
+**Improvements**
+- [#621](https://github.com/NLog/NLog.Extensions.Logging/pull/621):  Added embedded resource ILLink.Descriptors.xml (@snakefoot)
+- [#619](https://github.com/NLog/NLog.Extensions.Logging/pull/619):  Bump NLog from 5.0.3 to 5.0.4 (@snakefoot)
+
 ### Version 5.0.3 (2022/09/01)
 
 **Improvements**

diff --git a/build.ps1 b/build.ps1
@@ -2,7 +2,7 @@
 # creates NuGet package at \artifacts
 dotnet --version
 
-$versionPrefix = "5.0.3"
+$versionPrefix = "5.0.4"
 $versionSuffix = ""
 $versionFile = $versionPrefix + "." + ${env:APPVEYOR_BUILD_NUMBER}
 $versionProduct = $versionPrefix;

diff --git a/src/NLog.Extensions.Hosting/ILLink.Descriptors.xml b/src/NLog.Extensions.Hosting/ILLink.Descriptors.xml
@@ -0,0 +1,5 @@
+<linker>
+  <assembly fullname="NLog" preserve="all" />
+  <assembly fullname="NLog.Extensions.Logging" preserve="all" />
+  <assembly fullname="NLog.Extensions.Hosting" preserve="all" />
+</linker>
diff --git a/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj b/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj
@@ -35,7 +35,7 @@ Full changelog: https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHAN
     <!-- EmbedUntrackedSources for deterministic build -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
-
+  
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
   </ItemGroup>
@@ -57,9 +57,16 @@ Full changelog: https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHAN
     <ProjectReference Include="..\NLog.Extensions.Logging\NLog.Extensions.Logging.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="ILLink.Descriptors.xml">
+      <LogicalName>ILLink.Descriptors.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="N.png" Pack="true" PackagePath="" Visible="false" />
   </ItemGroup>
+
   <Target Name="DownloadMissingContent" BeforeTargets="GenerateNuspec">
     <DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
   </Target>

diff --git a/src/NLog.Extensions.Logging/ILLink.Descriptors.xml b/src/NLog.Extensions.Logging/ILLink.Descriptors.xml
@@ -0,0 +1,4 @@
+<linker>
+  <assembly fullname="NLog" preserve="all" />
+  <assembly fullname="NLog.Extensions.Logging" preserve="all" />
+</linker>
diff --git a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj
@@ -34,14 +34,11 @@ List of major changes in NLog 5.0: https://nlog-project.org/2021/08/25/nlog-5-0-
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
     <AssemblyOriginatorKeyFile>..\NLog.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <LangVersion>latest</LangVersion>
     <!-- EmbedUntrackedSources for deterministic build -->
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
-  <Target Name="DownloadMissingContent" BeforeTargets="GenerateNuspec">
-    <DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
-  </Target>
-
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Title>NLog.Extensions.Logging for .NET Framework 4.6.1</Title>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
@@ -68,8 +65,12 @@ List of major changes in NLog 5.0: https://nlog-project.org/2021/08/25/nlog-5-0-
     <Title>NLog.Extensions.Logging for .NET 5.0</Title>
     <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyTitle>$(Title)</AssemblyTitle>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.3" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -99,14 +100,20 @@ List of major changes in NLog 5.0: https://nlog-project.org/2021/08/25/nlog-5-0-
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="ILLink.Descriptors.xml">
+      <LogicalName>ILLink.Descriptors.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <Target Name="DownloadMissingContent" BeforeTargets="GenerateNuspec">
+    <DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
+  </Target>
+
   <ItemGroup>
     <None Include="N.png" Pack="true" PackagePath="" Visible="false" />
   </ItemGroup>
   <Target Name="DownloadMissingContent" BeforeTargets="GenerateNuspec">
     <DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
   </Target>
-  <PropertyGroup>
-    <AssemblyTitle>$(Title)</AssemblyTitle>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
 </Project>