From 1a6a76162806e6278d86299121e7fefceb40f9ac Mon Sep 17 00:00:00 2001
From: Robert McLaws <1657085+robertmclaws@users.noreply.github.com>
Date: Sun, 15 Sep 2024 13:31:40 -0400
Subject: [PATCH 1/2] Update Project Template

- Adjust Project Sdk definition syntax to match how other SDK-style projects are structured, to reduce end-user confusion.

- Add a PreBuild target that corrects a build-time bug in Visual Studio that triggers an unnecessary NuGet restore failure.
---
 .../sqlproject/SqlProject1.sqlproj            | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj b/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
index bd6d3b8..3c8f6d3 100644
--- a/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
+++ b/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build">
-  <Sdk Name="Microsoft.Build.Sql" Version="###ASSEMBLY_VERSION###" />
-  <PropertyGroup>
-    <Name>SqlProject1</Name>
-    <DSP>Microsoft.Data.Tools.Schema.Sql.{TargetPlatform}DatabaseSchemaProvider</DSP>
-    <ModelCollation>1033, CI</ModelCollation>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.Build.Sql/###ASSEMBLY_VERSION###" DefaultTargets="Build">
+
+    <PropertyGroup>
+        <Name>SqlProject1</Name>
+        <DSP>Microsoft.Data.Tools.Schema.Sql.{TargetPlatform}DatabaseSchemaProvider</DSP>
+        <ModelCollation>1033, CI</ModelCollation>
+    </PropertyGroup>
+
+    <!-- Correct the build in Visual Studio so it doesn't trigger a NuGet Framework Reference error.
+    <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(MSBuildRuntimeType)' != 'Core'">
+        <Message Importance="high" Text="Ensuring the $(MSBuildThisFileDirectory)\obj\project.assets.json file is removed, if necessary, so that the database project can be built through VisualStudio SSDT without errors" />
+        <Delete Files="$(MSBuildThisFileDirectory)\obj\project.assets.json" />
+    </Target>
+
+</Project>

From c58ce5ed814e29d879ab92d5777df1095143c0d2 Mon Sep 17 00:00:00 2001
From: Robert McLaws <1657085+robertmclaws@users.noreply.github.com>
Date: Sun, 15 Sep 2024 15:31:19 -0400
Subject: [PATCH 2/2] Fix Dacpac Build Properties

- Change Name to SqlTargetName, which is baked into `Microsoft.Data.Tools.Schema.SqlTasks.targets` to control the output file name & Dacpac metadata name.
- Add DacVersion to help developers understand how to control the versioning.
---
 .../sqlproject/SqlProject1.sqlproj                             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj b/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
index 3c8f6d3..daf55bc 100644
--- a/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
+++ b/src/Microsoft.Build.Sql.Templates/sqlproject/SqlProject1.sqlproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.Build.Sql/###ASSEMBLY_VERSION###" DefaultTargets="Build">
 
     <PropertyGroup>
-        <Name>SqlProject1</Name>
+        <SqlTargetName>SqlProject1</SqlTargetName>
+        <DacVersion>1.0.0.0<DacVersion>
         <DSP>Microsoft.Data.Tools.Schema.Sql.{TargetPlatform}DatabaseSchemaProvider</DSP>
         <ModelCollation>1033, CI</ModelCollation>
     </PropertyGroup>