From 5ce3c9f499622bafc4fc3eb4763beb421ead5492 Mon Sep 17 00:00:00 2001
From: Sergey Bykov <sbykov@microsoft.com>
Date: Tue, 15 Oct 2019 17:38:15 -0700
Subject: [PATCH] Remove SQL scripts from AdoNet NuGet packages. (#6049)

---
 ...icrosoft.Orleans.Clustering.AdoNet.targets | 18 -------
 .../Orleans.Clustering.AdoNet.csproj          | 50 ------------------
 ...crosoft.Orleans.Persistence.AdoNet.targets | 18 -------
 .../Orleans.Persistence.AdoNet.csproj         | 46 -----------------
 ...Microsoft.Orleans.Reminders.AdoNet.targets | 18 -------
 .../Orleans.Reminders.AdoNet.csproj           | 51 -------------------
 6 files changed, 201 deletions(-)
 delete mode 100644 src/AdoNet/Orleans.Clustering.AdoNet/Microsoft.Orleans.Clustering.AdoNet.targets
 delete mode 100644 src/AdoNet/Orleans.Persistence.AdoNet/Microsoft.Orleans.Persistence.AdoNet.targets
 delete mode 100644 src/AdoNet/Orleans.Reminders.AdoNet/Microsoft.Orleans.Reminders.AdoNet.targets

diff --git a/src/AdoNet/Orleans.Clustering.AdoNet/Microsoft.Orleans.Clustering.AdoNet.targets b/src/AdoNet/Orleans.Clustering.AdoNet/Microsoft.Orleans.Clustering.AdoNet.targets
deleted file mode 100644
index d44b325e56..0000000000
--- a/src/AdoNet/Orleans.Clustering.AdoNet/Microsoft.Orleans.Clustering.AdoNet.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="MicrosoftOrleansClusteringAdoNetCopySqlFiles" BeforeTargets="PrepareForBuild">
-    <!-- These are the source content files needed in the project. Note that $(TargetFramework) cannot be used here since it can be netcoreapp2.0 or somesuch. -->
-    <ItemGroup>
-      <MicrosoftOrleansClusteringAdoNetItems Include="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\**\*.sql" />
-    </ItemGroup>
-
-    <!-- The user may have modified the *.sql files fit for deployment. So they shouldn't be overwritten when Nuget restore is made. -->
-    <Copy
-      SourceFiles="@(MicrosoftOrleansClusteringAdoNetItems)"
-      DestinationFolder="$(MSBuildProjectDirectory)/OrleansAdoNetContent/%(RecursiveDir)"
-      Condition="!(Exists(@(Packages->'$(TargetDir)%(Filename)%(Extension)')))"
-      OverwriteReadOnlyFiles="false"
-      Retries="2"
-      RetryDelayMilliseconds="400"/>
-  </Target>
-</Project>
diff --git a/src/AdoNet/Orleans.Clustering.AdoNet/Orleans.Clustering.AdoNet.csproj b/src/AdoNet/Orleans.Clustering.AdoNet/Orleans.Clustering.AdoNet.csproj
index 8ed3391a6c..661f3e48fd 100644
--- a/src/AdoNet/Orleans.Clustering.AdoNet/Orleans.Clustering.AdoNet.csproj
+++ b/src/AdoNet/Orleans.Clustering.AdoNet/Orleans.Clustering.AdoNet.csproj
@@ -33,54 +33,4 @@
     <PackageReference Include="System.Data.Common" Version="$(SystemDataCommonVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Storage\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="MySQL-Clustering.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="Oracle-Clustering.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="PostgreSQL-Clustering.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="SQLServer-Clustering.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <None Include="..\Shared\MySQL-Main.sql" Link="MySQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\Oracle-Main.sql" Link="Oracle-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="..\Shared\PostgreSQL-Main.sql" Link="PostgreSQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\SQLServer-Main.sql" Link="SQLServer-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <Content Include="Microsoft.Orleans.Clustering.AdoNet.targets">
-      <PackagePath>build/$(TargetFramework)/</PackagePath>
-      <Pack>true</Pack>
-    </Content>
-  </ItemGroup>
 </Project>
diff --git a/src/AdoNet/Orleans.Persistence.AdoNet/Microsoft.Orleans.Persistence.AdoNet.targets b/src/AdoNet/Orleans.Persistence.AdoNet/Microsoft.Orleans.Persistence.AdoNet.targets
deleted file mode 100644
index eda65d3350..0000000000
--- a/src/AdoNet/Orleans.Persistence.AdoNet/Microsoft.Orleans.Persistence.AdoNet.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="MicrosoftOrleansPersistenceAdoNetCopySqlFiles" BeforeTargets="PrepareForBuild">
-    <!-- These are the source content files needed in the project. Note that $(TargetFramework) cannot be used here since it can be netcoreapp2.0 or somesuch. -->
-    <ItemGroup>
-      <MicrosoftOrleansPersistenceAdoNetItems Include="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\**\*.sql" />
-    </ItemGroup>
-
-    <!-- The user may have modified the *.sql files fit for deployment. So they shouldn't be overwritten. -->
-    <Copy
-      SourceFiles="@(MicrosoftOrleansPersistenceAdoNetItems)"
-      DestinationFolder="$(MSBuildProjectDirectory)/OrleansAdoNetContent/%(RecursiveDir)"
-      Condition="!(Exists(@(Packages->'$(TargetDir)%(Filename)%(Extension)')))"
-      OverwriteReadOnlyFiles="false"
-      Retries="2"
-      RetryDelayMilliseconds="400"/>
-  </Target>
-</Project>
diff --git a/src/AdoNet/Orleans.Persistence.AdoNet/Orleans.Persistence.AdoNet.csproj b/src/AdoNet/Orleans.Persistence.AdoNet/Orleans.Persistence.AdoNet.csproj
index 879e9116f1..66db150ef7 100644
--- a/src/AdoNet/Orleans.Persistence.AdoNet/Orleans.Persistence.AdoNet.csproj
+++ b/src/AdoNet/Orleans.Persistence.AdoNet/Orleans.Persistence.AdoNet.csproj
@@ -33,50 +33,4 @@
     <PackageReference Include="System.Data.Common" Version="$(SystemDataCommonVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="MySQL-Persistence.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="Oracle-Persistence.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="PostgreSQL-Persistence.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="SQLServer-Persistence.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <None Include="..\Shared\MySQL-Main.sql" Link="MySQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\Oracle-Main.sql" Link="Oracle-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="..\Shared\PostgreSQL-Main.sql" Link="PostgreSQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\SQLServer-Main.sql" Link="SQLServer-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <Content Include="Microsoft.Orleans.Persistence.AdoNet.targets">
-      <PackagePath>build/$(TargetFramework)/</PackagePath>
-      <Pack>true</Pack>
-    </Content>
-  </ItemGroup>
 </Project>
diff --git a/src/AdoNet/Orleans.Reminders.AdoNet/Microsoft.Orleans.Reminders.AdoNet.targets b/src/AdoNet/Orleans.Reminders.AdoNet/Microsoft.Orleans.Reminders.AdoNet.targets
deleted file mode 100644
index b44f33d148..0000000000
--- a/src/AdoNet/Orleans.Reminders.AdoNet/Microsoft.Orleans.Reminders.AdoNet.targets
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="MicrosoftOrleansRemindersAdoNetCopySqlFiles" BeforeTargets="PrepareForBuild">
-    <!-- These are the source content files needed in the project. Note that $(TargetFramework) cannot be used here since it can be netcoreapp2.0 or somesuch. -->
-    <ItemGroup>
-      <MicrosoftOrleansRemindersAdoNetItems Include="$(MSBuildThisFileDirectory)..\..\lib\netstandard2.0\**\*.sql" />
-    </ItemGroup>
-
-    <!-- The user may have modified the *.sql files fit for deployment. So they shouldn't be overwritten. -->
-    <Copy
-      SourceFiles="@(MicrosoftOrleansRemindersAdoNetItems)"
-      DestinationFolder="$(MSBuildProjectDirectory)/OrleansAdoNetContent/%(RecursiveDir)"
-      Condition="!(Exists(@(Packages->'$(TargetDir)%(Filename)%(Extension)')))"
-      OverwriteReadOnlyFiles="false"
-      Retries="2"
-      RetryDelayMilliseconds="400"/>
-  </Target>
-</Project>
diff --git a/src/AdoNet/Orleans.Reminders.AdoNet/Orleans.Reminders.AdoNet.csproj b/src/AdoNet/Orleans.Reminders.AdoNet/Orleans.Reminders.AdoNet.csproj
index bb07a30bdb..f0623c0625 100644
--- a/src/AdoNet/Orleans.Reminders.AdoNet/Orleans.Reminders.AdoNet.csproj
+++ b/src/AdoNet/Orleans.Reminders.AdoNet/Orleans.Reminders.AdoNet.csproj
@@ -34,55 +34,4 @@
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Storage\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="MySQL-Reminders.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="Oracle-Reminders.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="PostgreSQL-Reminders.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="SQLServer-Reminders.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <None Include="..\Shared\MySQL-Main.sql" Link="MySQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\MySQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\Oracle-Main.sql" Link="Oracle-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\Oracle\</PackagePath>
-    </None>
-    <None Include="..\Shared\PostgreSQL-Main.sql" Link="PostgreSQL-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\PostgreSQL\</PackagePath>
-    </None>
-    <None Include="..\Shared\SQLServer-Main.sql" Link="SQLServer-Main.sql">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>lib\$(TargetFramework)\SQLServer\</PackagePath>
-    </None>
-    <Content Include="Microsoft.Orleans.Reminders.AdoNet.targets">
-      <PackagePath>build/$(TargetFramework)/</PackagePath>
-      <Pack>true</Pack>
-    </Content>
-  </ItemGroup>
-
 </Project>