Merge branch 'release/0.5.2'

cake-contrib · Oct 16, 2019 · 66473aa · 66473aa
2 parents 19ddc00 + b492317
commit 66473aa
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 48 deletions.
diff --git a/src/Cake.SSRS.Tests/Cake.SSRS.Tests.csproj b/src/Cake.SSRS.Tests/Cake.SSRS.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2</TargetFrameworks>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -76,8 +76,12 @@
     <PackageReference Include="Cake.Testing" Version="0.33.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="4.4.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -86,16 +90,4 @@
   <ItemGroup>
     <ProjectReference Include="..\Cake.SSRS\Cake.SSRS.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <Reference Include="System.ServiceModel" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.4.0" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Cake.SSRS/Cake.SSRS.csproj b/src/Cake.SSRS/Cake.SSRS.csproj
@@ -1,31 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningLevel>0</WarningLevel>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup>
     <Title>Cake.SSRS</Title>
     <Description>SQL Server Reporting Services addin for cake build.</Description>
     <Authors>louisfischer</Authors>
-    <Copyright>Copyright (c) Cake Contributions Organization 2019</Copyright>
-    <PackageTags>Cake Script Report Reporting SSRS Sql-Server</PackageTags>
+    <Copyright>Copyright (c) Cake Contributions Organization © 2015-$([System.DateTime]::Now.Year)</Copyright>
+    <PackageTags>Cake;Script;Report;Reporting;SSRS;Sql-Server;Build;Sql-Server-Reporting-Services;</PackageTags>
     <PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics@a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</PackageIconUrl>
     <PackageProjectUrl>http://cake-contrib.github.io/Cake.SSRS/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/cake-contrib/Cake.SSRS.git</RepositoryUrl>
-    <PackageReleaseNotes>https://github.com/cake-contrib/Cake.SSRS/releases/tag/0.5.0</PackageReleaseNotes>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
+    <PackageReleaseNotes>https://github.com/cake-contrib/Cake.SSRS/releases/tag/0.5.2</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-
     <DocumentationFile>bin\Debug\netstandard2.0\Cake.SSRS.xml</DocumentationFile>
   </PropertyGroup>
 
@@ -39,34 +38,35 @@
     <PackageReference Include="System.ServiceModel.Http" Version="4.6.0" PrivateAssets="All" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0" PrivateAssets="All" />
     <PackageReference Include="System.ServiceModel.Security" Version="4.6.0" PrivateAssets="All" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.6.0" PrivateAssets="All" />
-    <PackageReference Include="System.Reflection.DispatchProxy" Version="4.6.0" PrivateAssets="All" />
+    <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" PrivateAssets="All"  />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="3rdPartyLicense.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
+  <Target Name="ILRepack" AfterTargets="Build">
+    <PropertyGroup>
+      <WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
+    </PropertyGroup>
+    <ItemGroup>
+      <InputAssemblies Include="System.ServiceModel.dll" />
+      <InputAssemblies Include="System.ServiceModel.Duplex.dll" />
+      <InputAssemblies Include="System.ServiceModel.Http.dll" />
+      <InputAssemblies Include="System.ServiceModel.NetTcp.dll" />
+      <InputAssemblies Include="System.ServiceModel.Primitives.dll" />
+      <InputAssemblies Include="System.ServiceModel.Security.dll" />
+      <InputAssemblies Include="System.Reflection.DispatchProxy.dll" />
+      <InputAssemblies Include="System.Private.ServiceModel.dll" />
+      <InputAssemblies Include="System.Security.Principal.Windows.dll" />
+    </ItemGroup>
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)\**\Cake.SSRS.*">
-        <PackagePath>lib\$(TargetFramework)\</PackagePath>
-      </TfmSpecificPackageFile>
-      <TfmSpecificPackageFile Include="$(OutputPath)\**\System.Private.ServiceModel.dll">
-        <PackagePath>lib\$(TargetFramework)\</PackagePath>
-      </TfmSpecificPackageFile>
-      <TfmSpecificPackageFile Include="$(OutputPath)\**\System.ServiceModel.*.dll">
-        <PackagePath>lib\$(TargetFramework)\</PackagePath>
-      </TfmSpecificPackageFile>
-      <TfmSpecificPackageFile Include="$(OutputPath)\**\System.Security.Principal.Windows.dll">
-        <PackagePath>lib\$(TargetFramework)\</PackagePath>
-      </TfmSpecificPackageFile>
-      <TfmSpecificPackageFile Include="$(OutputPath)\**\System.Reflection.DispatchProxy.dll">
-        <PackagePath>lib\$(TargetFramework)\</PackagePath>
-      </TfmSpecificPackageFile>
+      <!-- Dot not internalize any types inside this assembly -->
+      <InternalizeExcludeAssemblies Include="Cake.Core.dll" />
     </ItemGroup>
+    <Message Text="MERGING: @(InputAssemblies->'%(Filename)') into $(OutputAssembly)" Importance="High" />
+    <ILRepack
+        OutputType="$(OutputType)"
+        MainAssembly="$(AssemblyName).dll"
+        OutputAssembly="$(AssemblyName).dll"
+        InputAssemblies="@(InputAssemblies)"
+        InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)"
+        WorkingDirectory="$(WorkingDirectory)" />
   </Target>
-
 </Project>