Skip to content

Commit d7c8288

Browse files
committed
Actually make it work now
1 parent bdd30cf commit d7c8288

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/SdkStyleProjectGeneration.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public SdkStyleProjectGeneration() : base(
4040
"LaunchProfiles",
4141
"SharedProjectReferences",
4242
"ReferenceManagerSharedProjects",
43-
"ProjectReferences",
4443
"ReferenceManagerProjects",
4544
"COMReferences",
4645
"ReferenceManagerCOM",
@@ -61,7 +60,9 @@ internal override void GetProjectHeader(ProjectProperties properties, out String
6160
headerBuilder.Append(@" <PropertyGroup>").Append(k_WindowsNewline);
6261
headerBuilder.Append($" <BaseIntermediateOutputPath>{@"Temp\obj\$(MSBuildProjectName)".NormalizePathSeparators()}</BaseIntermediateOutputPath>").Append(k_WindowsNewline);
6362
headerBuilder.Append(@" <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>").Append(k_WindowsNewline);
64-
headerBuilder.Append(@" <OutputPath>").Append(properties.OutputPath).Append(@"</OutputPath>").Append(k_WindowsNewline);
63+
headerBuilder.Append(@" <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>").Append(k_WindowsNewline);
64+
headerBuilder.Append(@" <UseCommonOutputDirectory>true</UseCommonOutputDirectory>").Append(k_WindowsNewline);
65+
headerBuilder.Append($" <OutputPath>").Append(properties.OutputPath.NormalizePathSeparators()).Append(@"</OutputPath>").Append(k_WindowsNewline);
6566
headerBuilder.Append(@" </PropertyGroup>").Append(k_WindowsNewline);
6667

6768
// Supported capabilities
@@ -100,7 +101,7 @@ internal override void AppendProjectReference(Assembly assembly, Assembly refere
100101
{
101102
// If the current assembly is a Player project, we want to project-reference the corresponding Player project
102103
var referenceName = m_AssemblyNameProvider.GetAssemblyName(assembly.outputPath, reference.name);
103-
projectBuilder.Append(@" <ProjectReference Include=""").Append(referenceName).Append(GetProjectExtension()).Append(@""" />").Append(k_WindowsNewline);
104+
projectBuilder.Append(@" <ProjectReference Include=""$(MSBuildThisFileDirectory)").Append(referenceName).Append(GetProjectExtension()).Append(@""" />").Append(k_WindowsNewline);
104105
}
105106

106107
internal override void GetProjectFooter(StringBuilder footerBuilder)

0 commit comments

Comments
 (0)