aspnetcore/modules/DotNetTools

commit 2a1cf12ae9ac6f3adba98bd44f093f9210d17cda
Merge: ba676a9f624 4baa07ccae9
Author: Nate McMaster <[email protected]>
Date:   Fri Sep 28 11:54:18 2018 -0700

    Merge branch 'release/2.2'

diff --cc src/dotnet-sql-cache/dotnet-sql-cache.csproj
index b568743f331,59017c22ff5..f877ba3b78d
--- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
@@@ -1,7 -1,7 +1,7 @@@
--<Project Sdk="Microsoft.NET.Sdk">
++<Project Sdk="Microsoft.NET.Sdk">
  
    <PropertyGroup>
 -    <TargetFramework>netcoreapp2.2</TargetFramework>
 +    <TargetFramework>netcoreapp3.0</TargetFramework>
      <OutputType>exe</OutputType>
      <Description>Command line tool to create tables and indexes in a Microsoft SQL Server database for distributed caching.</Description>
      <PackageTags>cache;distributedcache;sqlserver</PackageTags>
@@@ -21,16 -21,15 +21,16 @@@
  
    <ItemGroup>
      <!-- These files should be signed by corefx -->
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-arm64/native/sni.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x64/native/sni.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x86/native/sni.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Data.SqlClient.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Security.Permissions.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Runtime.CompilerServices.Unsafe.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Text.Encoding.CodePages.dll" />
-     <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/win-arm64/native/sni.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/win-arm64/native/sni.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/win-x64/native/sni.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/win-x64/native/sni.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/win-x86/native/sni.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/win-x86/native/sni.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)System.Data.SqlClient.dll" PackagePath="tools/$(TargetFramework)/any/System.Data.SqlClient.dll" />
++    <ExcludePackageFileFromSigning Include="$(PublishDir)System.Security.Permissions.dll" PackagePath="tools/$(TargetFramework)/any/System.Security.Permissions.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)System.Runtime.CompilerServices.Unsafe.dll" PackagePath="tools/$(TargetFramework)/any/System.Runtime.CompilerServices.Unsafe.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)System.Text.Encoding.CodePages.dll" PackagePath="tools/$(TargetFramework)/any/System.Text.Encoding.CodePages.dll" />
+     <ExcludePackageFileFromSigning Include="$(PublishDir)runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll" PackagePath="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll" />
    </ItemGroup>
  
  </Project>