Update package format for symbols, license and SourceLink

nhibernate · Feb 27, 2019 · 81b605e · 81b605e
1 parent 73b5722
commit 81b605e
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 75 deletions.
diff --git a/...es.CoreDistributedCache.Memcached/NHibernate.Caches.CoreDistributedCache.Memcached.csproj b/...es.CoreDistributedCache.Memcached/NHibernate.Caches.CoreDistributedCache.Memcached.csproj
@@ -8,14 +8,8 @@
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>False</SignAssembly>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #53 - Disable append-hashcode when library is not built for netFx
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -36,5 +30,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EnyimMemcachedCore" Version="2.1.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/...e.Caches.CoreDistributedCache.Memory/NHibernate.Caches.CoreDistributedCache.Memory.csproj b/...e.Caches.CoreDistributedCache.Memory/NHibernate.Caches.CoreDistributedCache.Memory.csproj
@@ -10,14 +10,8 @@ Meant for testing purpose, consider NHibernate.Caches.CoreMemoryCache for other
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #53 - Disable append-hashcode when library is not built for netFx
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -38,5 +32,6 @@ Meant for testing purpose, consider NHibernate.Caches.CoreMemoryCache for other
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/...ate.Caches.CoreDistributedCache.Redis/NHibernate.Caches.CoreDistributedCache.Redis.csproj b/...ate.Caches.CoreDistributedCache.Redis/NHibernate.Caches.CoreDistributedCache.Redis.csproj
@@ -3,20 +3,15 @@
   <PropertyGroup>
     <Product>NHibernate.Caches.CoreDistributedCache.Redis</Product>
     <Title>NHibernate.Caches.CoreDistributedCache.Redis</Title>
-    <Description>Redis cache provider for NHibernate using .Net Core IDistributedCache (Microsoft.Extensions.Caching.Redis).</Description>
+    <Description>Redis cache provider for NHibernate using .Net Core IDistributedCache (Microsoft.Extensions.Caching.Redis).
+    Consider using NHibernate.Caches.StackExchangeRedis instead: IDistributedCache contract limits the Redis features we can use.</Description>
     <!-- Targeting net461 explicitly in order to avoid https://github.com/dotnet/standard/issues/506 for net461 consumers-->
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #53 - Disable append-hashcode when library is not built for netFx
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -37,5 +32,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/...es.CoreDistributedCache.SqlServer/NHibernate.Caches.CoreDistributedCache.SqlServer.csproj b/...es.CoreDistributedCache.SqlServer/NHibernate.Caches.CoreDistributedCache.SqlServer.csproj
@@ -9,14 +9,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #53 - Disable append-hashcode when library is not built for netFx
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -37,5 +31,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/...ache/NHibernate.Caches.CoreDistributedCache/NHibernate.Caches.CoreDistributedCache.csproj b/...ache/NHibernate.Caches.CoreDistributedCache/NHibernate.Caches.CoreDistributedCache.csproj
@@ -10,14 +10,8 @@ This provider is not bound to a specific implementation and require a cache fact
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #53 - Disable append-hashcode when library is not built for netFx
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -31,6 +25,7 @@ This provider is not bound to a specific implementation and require a cache fact
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/CoreMemoryCache/NHibernate.Caches.CoreMemoryCache/NHibernate.Caches.CoreMemoryCache.csproj b/CoreMemoryCache/NHibernate.Caches.CoreMemoryCache/NHibernate.Caches.CoreMemoryCache.csproj
@@ -10,8 +10,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -22,6 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/EnyimMemcached/NHibernate.Caches.EnyimMemcached/NHibernate.Caches.EnyimMemcached.csproj b/EnyimMemcached/NHibernate.Caches.EnyimMemcached/NHibernate.Caches.EnyimMemcached.csproj
@@ -8,14 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Bug
-    * #32 - Key computing for Memcached leaks hashers
-
-* Improvement
-    * #52 - Cease using cryptographic hashes
-
-* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
@@ -26,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EnyimMemcached" Version="2.12.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/NHibernate.Caches.props b/NHibernate.Caches.props
@@ -15,11 +15,12 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageIconUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/logo/NHibernate-NuGet.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/NHibernate-Caches/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/nhibernate/NHibernate-Caches</PackageProjectUrl>
     <PackageTags>nhibernate; cache</PackageTags>
-    <RepositoryUrl>https://github.com/nhibernate/NHibernate-Caches.git</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />

diff --git a/RtMemoryCache/NHibernate.Caches.RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj b/RtMemoryCache/NHibernate.Caches.RtMemoryCache/NHibernate.Caches.RtMemoryCache.csproj
@@ -8,14 +8,15 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
     <None Include="..\default.build" Link="default.build" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/...ngeRedis/NHibernate.Caches.StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.csproj b/...ngeRedis/NHibernate.Caches.StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.csproj
@@ -9,6 +9,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -21,6 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Iesi.Collections" Version="4.0.4" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.495" />
   </ItemGroup>

diff --git a/SysCache/NHibernate.Caches.SysCache/NHibernate.Caches.SysCache.csproj b/SysCache/NHibernate.Caches.SysCache/NHibernate.Caches.SysCache.csproj
@@ -8,14 +8,15 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
     <None Include="..\default.build" Link="default.build" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/SysCache2/NHibernate.Caches.SysCache2/NHibernate.Caches.SysCache2.csproj b/SysCache2/NHibernate.Caches.SysCache2/NHibernate.Caches.SysCache2.csproj
@@ -8,14 +8,15 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageReleaseNotes>* Task
-    * #56 - Upgrade to NH 5.2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
     <None Include="..\default.build" Link="default.build" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="NHibernate" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Util/NHibernate.Caches.Util.JsonSerializer/NHibernate.Caches.Util.JsonSerializer.csproj b/Util/NHibernate.Caches.Util.JsonSerializer/NHibernate.Caches.Util.JsonSerializer.csproj
@@ -8,6 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageReleaseNotes>* Improvement
+    * #60 - Update package format for symbols, license and SourceLink</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
     <DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
@@ -20,6 +22,7 @@
     <ProjectReference Include="..\..\NHibernate.Caches.Common\NHibernate.Caches.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -91,12 +91,9 @@ after_build:
         $nugetExe = Join-Path $nugetPath 'NuGet.exe'
         $wc.DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', $nugetExe)
         Add-Content 'NuGetPush.bat' "rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey'"
-        Get-Item '*.nupkg' -exclude '*.symbols.nupkg' | ForEach-Object {
+        Get-Item '*.nupkg' | ForEach-Object {
             Add-Content 'NuGetPush.bat' "nuget push -source https://nuget.org/ $($_.Name)"
         }
-        Get-Item '*.symbols.nupkg' | ForEach-Object {
-            Add-Content 'NuGetPush.bat' "nuget push -source https://nuget.smbsrc.net/ $($_.Name)"
-        }
         cd $env:APPVEYOR_BUILD_FOLDER
         7z a "$nugetFolderName.zip" "$nugetFolderName\"
     }
@@ -149,6 +146,7 @@ test_script:
     }
 artifacts:
   - path: 'nuget_gallery\*.nupkg'
+  - path: 'nuget_gallery\*.snupkg'
   - path: 'nuget_gallery.zip'
     name: NuGet packages
   - path: 'NHCH-*-bin.zip'

diff --git a/buildcommon.xml b/buildcommon.xml
@@ -161,23 +161,12 @@
       <in>
         <items>
           <include name="${nuget.nupackages.dir}/*.nupkg"/>
-          <exclude name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
         </items>
       </in>
       <do>
         <echo message="nuget push -source https://nuget.org/ ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
       </do>
     </foreach>
-    <foreach item="File" property="filename">
-      <in>
-        <items>
-          <include name="${nuget.nupackages.dir}/*.symbols.nupkg"/>
-        </items>
-      </in>
-      <do>
-        <echo message="nuget push -source https://nuget.smbsrc.net/ ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
-      </do>
-    </foreach>
   </target>
 
   <target name="common.clean">