Adjusting DBP to exclude test resources from accidentally being added…

… to IsTestProject.
simple-odata-client · Mar 28, 2024 · 205f380 · 205f380
1 parent b053f79
commit 205f380
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,8 +2,8 @@
 	<!-- Folder layout -->
 	<PropertyGroup>
 		<IsBenchmarkProject Condition="$(MSBuildProjectName.ToLower().Contains('.benchmarks.'))">true</IsBenchmarkProject>
-		<IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.'))">true</IsTestProject>
 		<IsTestAssetProject Condition="$(MSBuildProjectName.ToLower().Contains('tests.shared.'))">true</IsTestAssetProject>
+		<IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.')) == 'true' AND $(IsTestAssetProject) != 'true'">true</IsTestProject>
 		<IsSampleProject Condition="$(MSBuildProjectName.ToLower().Contains('.samples.'))">true</IsSampleProject>
 		<IsNetCore Condition=" '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0' ">true</IsNetCore>
 		<IsPrimaryProject Condition=" '$(IsBenchmarkProject)' != 'true' AND '$(IsTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND '$(IsSampleProject)' != 'true' ">true</IsPrimaryProject>

diff --git a/...ple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj b/...ple.OData.Tests.Shared.NorthwindService/Simple.OData.Tests.Shared.NorthwindService.csproj
@@ -5,10 +5,4 @@
 		<DocumentationFile>$(DocumentationFile)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 
-	<!-- @robertmclaws: This is temporary and should be removed when Microsoft.NET.Test.Sdk 17.10 RTMs. -->
-	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*-*" />
-		<PackageReference Include="Microsoft.TestPlatform" Version="17.*-*" />
-	</ItemGroup>
-
 </Project>