From a2aeced3a87f0496cd749282e6f9fc82e2139b36 Mon Sep 17 00:00:00 2001 From: "Zi Chen (from Dev Box)" Date: Fri, 9 Feb 2024 19:15:30 -0800 Subject: [PATCH 1/2] Remove DLLs from nupkg --- .../Microsoft.Build.Sql.csproj | 4 +- .../Microsoft.Build.Sql.nuspec | 2 +- ...crosoft.Data.Tools.Schema.SqlTasks.targets | 2177 +++++++++++++++++ src/Microsoft.Build.Sql/sdk/Sdk.props | 12 + src/Microsoft.Build.Sql/sdk/Sdk.targets | 22 +- 5 files changed, 2210 insertions(+), 7 deletions(-) create mode 100644 src/Microsoft.Build.Sql/sdk/Microsoft.Data.Tools.Schema.SqlTasks.targets diff --git a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj index d1c279c..e2089cb 100644 --- a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj +++ b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.nuspec b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.nuspec index c72ce4d..83e1929 100644 --- a/src/Microsoft.Build.Sql/Microsoft.Build.Sql.nuspec +++ b/src/Microsoft.Build.Sql/Microsoft.Build.Sql.nuspec @@ -21,7 +21,7 @@ - + diff --git a/src/Microsoft.Build.Sql/sdk/Microsoft.Data.Tools.Schema.SqlTasks.targets b/src/Microsoft.Build.Sql/sdk/Microsoft.Data.Tools.Schema.SqlTasks.targets new file mode 100644 index 0000000..101de38 --- /dev/null +++ b/src/Microsoft.Build.Sql/sdk/Microsoft.Data.Tools.Schema.SqlTasks.targets @@ -0,0 +1,2177 @@ + + + + + + + + + TODO + v4.6 + true + + + + + 0.0 + + + $(VsInstallRoot)\Common7\IDE + + + + $(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\VisualStudio\17.0@InstallDir) + + + + + $(ReferencePath);$(SSDTPath) + $(VsIdePath) + $(SSDTPath) + $(VsIdePath)\Extensions\Microsoft\SQLDB\DAC + + + + + true + false + + + + $(NETCoreTargetsPath) + $(NETCoreTargetsPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + .\bin\Output\ + + + + + false + Library + .dll + CS + TRACE;$(DefineConstants) + TRACE + DEBUG;$(DefineConstants) + DEBUG + + + + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT + + + + + $(BuildContributors); + $(DeploymentContributors); + + + + + ConfigurationName=$(ConfigurationName);$(ContributorArguments) + + + + + + + + + $(MSBuildAllProjects); + $(SsdtTargetsParentPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets + + + + + + true + true + true + true + true + dbo + true + false + + + + + + $(MSBuildProjectName) + $(SqlTargetName).dacpac + $(MSBuildProjectName) + $(SqlTargetName).sql + $(MSBuildProjectName).publish.sql + + + $(BaseIntermediateOutputPath)\_autogenerated_sqldb$(DefaultLanguageSourceExtension) + $(SqlTargetName)_Create.sql + + + $(IntermediateOutputPath) + $(ProjectDir)$(IntermediateOutputPath) + + $(GeneratedFilesIntermediatePath)$(TargetFileName) + + + $(GeneratedFilesIntermediatePath)$(TargetName).pdb + + $(TargetDir)$(CreateScriptFileName) + $(TargetDir)$(DacTargetFileName) + $(TargetDir)$(DeployScriptFileName) + $(TargetDir)$(PublishScriptFileName) + $(TargetDir)$(SqlTargetFile) + + + + + + + + + + $(SqlTargetName) + 1.0.0.0 + .2.0 + .dacpac + $(SqlTargetName)$(DacDownlevelVersion)$(DacTargetExtension) + + + + + + + + + + + + + + Build; + Deploy + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + true + + $([System.IO.Path]::Combine('$([System.IO.Path]::GetTempPath())','$(TargetFrameworkMoniker).SqlClrAttributes$(DefaultLanguageSourceExtension)')) + + + + + + + + + + + // <autogenerated /> + + + + + + ''autogenerated + Option Strict Off + Option Explicit On + + + + + + + + + + + + + + + + + $(GetCopyToOutputDirectoryItemsDependsOn); + SqlStudioSourceFilesToCopy + + + + + + + <_BuildItemsToCopy Include="@(Build)" Condition="'%(Build.CopyToOutputDirectory)'=='Always' or '%(Build.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + <_NoneItemsToCopy Include="@(None)" Condition="'%(None.CopyToOutputDirectory)'=='Always' or '%(None.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + <_PreDeployItemsToCopy Include="@(PreDeploy)" Condition="'%(PreDeploy.CopyToOutputDirectory)'=='Always' or '%(PreDeploy.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + + + + + <_PostDeployItemsToCopy Include="@(PostDeploy)" Condition="'%(PostDeploy.CopyToOutputDirectory)'=='Always' or '%(PostDeploy.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + <_BuildExtensionConfigurationItemsToCopy Include="@(BuildExtensionConfiguration)" Condition="'%(BuildExtensionConfiguration.CopyToOutputDirectory)'=='Always' or '%(BuildExtensionConfiguration.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + <_DeploymentExtensionConfigurationItemsToCopy Include="@(DeploymentExtensionConfiguration)" Condition="'%(DeploymentExtensionConfiguration.CopyToOutputDirectory)'=='Always' or '%(DeploymentExtensionConfiguration.CopyToOutputDirectory)'=='PreserveNewest'"/> + + + + + + + + + <_SourceItemsToCopyToOutputDirectoryAlways Include="@(_SqlStudioItemsToCopyWithTargetPath->'%(FullPath)')" Condition="'%(_SqlStudioItemsToCopyWithTargetPath.CopyToOutputDirectory)'=='Always'" /> + <_SourceItemsToCopyToOutputDirectory Include="@(_SqlStudioItemsToCopyWithTargetPath->'%(FullPath)')" Condition="'%(_SqlStudioItemsToCopyWithTargetPath.CopyToOutputDirectory)'=='PreserveNewest'" /> + + + + + + + + + + + + + <__SqlBuildInputItem Include="@(MSBuildAllProjects)"/> + <__SqlBuildInputItem Include="@(Build)"/> + <__SqlBuildInputItem Include="@(MSBuildProjectFullPath)"/> + <__SqlBuildInputItem Include="@(SqlReferencePath)"/> + <__SqlBuildInputItem Include="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/> + <__SqlBuildInputItem Include="$(IntermediateTargetFullFileName)" Condition="Exists('$(IntermediateTargetFullFileName)')"/> + <__SqlBuildInputItem Include="$(IntermediateSymbolsFullFileName)" Condition="Exists('$(IntermediateSymbolsFullFileName)')"/> + <__SqlBuildInputItem Include="@(PostDeploy)"/> + <__SqlBuildInputItem Include="@(PreDeploy)"/> + <__SqlBuildInputItem Include="@(RefactorLog)"/> + <__SqlBuildInputItem Include="@(BuildExtensionConfiguration)"/> + <__SqlBuildInputItem Include="@(DeploymentExtensionConfiguration)"/> + + + + + + + + + + + + + + + + + + + + + + <_SqlBuildOutputItem Include="@(SqlTarget)"/> + <_SqlBuildOutputItem Include="@(DacFile)" Condition="$(GenerateDac) == true"/> + <_SqlBuildOutputItem Include="@(CreateScriptFilePath)" Condition="$(GenerateCreateScript) == true"/> + + + + + + + + + + + + _SetupSqlBuildInputs; + _SetupSqlBuildOutputs; + + + + + + + $(AutoUpdateStatisticsIncremental) + + + + + + + + + + + + + + + + + + + + + + + + BuildOnlySettings; + BeforeBuild; + PrepareForBuild; + PreBuildEvent; + ResolveReferences; + ResolveArtifactReferences; + GenerateSqlTargetFrameworkMoniker; + ResolveKeySource; + CoreCompile; + GenerateSerializationAssemblies; + SqlBuild; + GetTargetPath; + PrepareForRun; + SqlPrepareForRun; + IncrementalClean; + PostBuildEvent; + AfterBuild; + + + + + + + + + + + + + + + + + + + + + + $(BuiltProjectOutputGroupDependsOn); + _SetupSqlBuildOutputs + + + + + + <_BuiltSqlProjectOutputGroupOutputIntermediate Include="@(SqlBuildOutputItem)"/> + + + + + + + + + + $(SourceFilesProjectOutputGroupDependsOn); + _SetupSqlBuildInputs + + + + + + + + + + + + + + + + + + + + + + $(ProjectFileName) + + + + + + + + + BuiltProjectOutputGroup; + BuiltSqlProjectOutputGroup; + DebugSymbolsProjectOutputGroup; + DocumentationProjectOutputGroup; + SatelliteDllsProjectOutputGroup; + SourceFilesProjectOutputGroup; + ContentFilesProjectOutputGroup; + SGenFilesOutputGroup; + + + + + BuiltProjectOutputGroup; + BuiltSqlProjectOutputGroup; + + + ContentFilesProjectOutputGroup; + + + SatelliteDllsProjectOutputGroup; + + + DocumentationProjectOutputGroup; + + + DebugSymbolsProjectOutputGroup; + + + SourceFilesProjectOutputGroup; + + + SGenFilesOutputGroup; + + + + + + + + + + + + + + + $(AutoUpdateStatisticsIncremental) + + + + + + + + + $(TargetDir)$(SqlTargetName).StaticCodeAnalysis.Results.xml + $(TargetDir)$(SqlTargetName)_StaticCodeAnalysisSucceededFile + + _SetupSqlBuildInputs; + ResolveReferences; + ResolveArtifactReferences; + SqlStaticCodeAnalysis + + + + + + + + + $(PrepareForRunDependsOn); + SqlRunCodeAnalysis + + + + + + true + + + + + + + + + + + + + $(CleanDependsOn); + CleanStaticCodeAnalysis; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _SetupSqlDeployInputs; + _SetupSqlDeployOutputs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BeforeDeploy; + PreDeployEvent; + SqlDeploy; + PostDeployEvent; + AfterDeploy + + + + + + + + + + + + + + + + + + + <__SqlPublishInputItem Include="@(SqlTarget)"/> + <__SqlPublishInputItem Include="$(SqlPublishProfilePath)" Condition="'$(SqlPublishProfilePath)' != ''"/> + + + + + + + + + + + + + + + + + + + + _SetupSqlPublishInputs; + _SetupSqlPublishOutputs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BeforePublish; + PrePublishEvent; + SqlPublish; + PostPublishEvent; + AfterPublish + + + + + + + + + + diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props index 5e70888..6343dc1 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.props +++ b/src/Microsoft.Build.Sql/sdk/Sdk.props @@ -62,4 +62,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets index aa8e616..3c00f8a 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.targets +++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets @@ -5,6 +5,15 @@ --> + + + + + $(PkgMicrosoft_SqlServer_DacFx)\lib\netstandard2.1 + + + + $(PackageType);DACPAC @@ -13,15 +22,20 @@ $(NoWarn),NU5128 + netstandard2.1 - - - + + + + + - + + + From 629804fc1c165a6ef287439868c666436585db19 Mon Sep 17 00:00:00 2001 From: "Zi Chen (from Dev Box)" Date: Wed, 14 Feb 2024 16:56:23 -0800 Subject: [PATCH 2/2] Add copy task --- src/Microsoft.Build.Sql/sdk/Sdk.props | 8 ++++---- src/Microsoft.Build.Sql/sdk/Sdk.targets | 17 +++++++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props index 6343dc1..a85e5ef 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.props +++ b/src/Microsoft.Build.Sql/sdk/Sdk.props @@ -64,12 +64,12 @@ - - + + - - + + diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets index 3c00f8a..c4a9e58 100644 --- a/src/Microsoft.Build.Sql/sdk/Sdk.targets +++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets @@ -6,12 +6,17 @@ - - - - $(PkgMicrosoft_SqlServer_DacFx)\lib\netstandard2.1 - - + + + + <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_DacFx)/lib/netstandard2.1/*.dll" /> + <__SqlBuildBinaries Include="$(PkgMicrosoft_Data_SqlClient)/lib/netstandard2.1/Microsoft.Data.SqlClient.dll" /> + <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_Server)/lib/netstandard2.0/Microsoft.SqlServer.Server.dll" /> + <__SqlBuildBinaries Include="$(PkgMicrosoft_SqlServer_Types)/lib/netstandard2.1/Microsoft.SqlServer.Types.dll" /> + <__SqlBuildBinaries Include="$(PkgSystem_ComponentModel_Composition)/lib/net6.0/System.ComponentModel.Composition.dll" /> + <__SqlBuildBinaries Include="$(PkgSystem_IO_Packaging)/lib/netstandard2.0/System.IO.Packaging.dll" /> + +