Test net8 (DynamoDS#14635)

* Test net8 * Also add DotNet to the build properties * Update CS_SDK.props * Update CS_SDK.props * update * update * update * Go back to net6 --------- Co-authored-by: pinzart <[email protected]>
dnenov · Nov 27, 2023 · 36fb8d3 · 36fb8d3
1 parent cbba6d0
commit 36fb8d3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/Config/CS_SDK.props b/src/Config/CS_SDK.props
@@ -21,8 +21,6 @@
     <UICulture>en-US</UICulture>
     <OutputType Condition=" '$(OutputType)' == '' ">Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <TestProjectDefaults Condition="$(MSBuildProjectDirectory.Contains('test'))">true</TestProjectDefaults>
-    <TestProjectDefaults Condition=" '$(TestProjectDefaults)' == '' ">false</TestProjectDefaults>
     <!--MSB3539: The value of the property "BaseIntermediateOutputPath" was modified after it was used by MSBuild-->
     <!--CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'-->
     <!--NUnit2005: Consider using Assert.That(actual, Is.EqualTo(expected)) instead of Assert.AreEqual(expected, actual)-->
@@ -87,10 +85,10 @@
       <Private>false</Private>
     </ProjectReference>
   </ItemDefinitionGroup>
-  <PropertyGroup Condition=" '$(TestProjectDefaults)' == 'true' ">
+  <PropertyGroup Condition=" '$(TestProject)' == 'true' ">
     <TestDependenciesPath>$(OutputPath)\..\..\..\test\test_dependencies</TestDependenciesPath>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition=" '$(TestProjectDefaults)' == 'true' ">
+  <ItemDefinitionGroup Condition=" '$(TestProject)' == 'true' ">
     <ProjectReference>
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
@@ -148,4 +146,4 @@
           </PropertyGroup>
       </Otherwise>
   </Choose>
-</Project>
+</Project>
diff --git a/src/build.xml b/src/build.xml
@@ -12,7 +12,7 @@
 
 <ItemGroup>
     <ProjectToBuild Include="$(Solution)" >
-        <Properties>Configuration=Release;Platform=$(Platform)</Properties>
+        <Properties>Configuration=Release;Platform=$(Platform);DotNet=$(DotNet)</Properties>
     </ProjectToBuild>
 </ItemGroup>
 

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <TestProject>true</TestProject>
+  </PropertyGroup>
+</Project>
diff --git a/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs b/test/DynamoCoreWpfTests/PackageManager/PackageManagerViewExtensionTests.cs
@@ -148,7 +148,7 @@ public void PackageManagerViewExtensionHasCorrectNumberOfRequestedExtensions()
         }
 
         [Test]
-        async public void LateLoadedViewExtensionsHaveMethodsCalled()
+        public void LateLoadedViewExtensionsHaveMethodsCalled()
         {
             var pkgviewExtension = View.viewExtensionManager.ViewExtensions.OfType<PackageManagerViewExtension>().FirstOrDefault();
             var pkgDir = Path.Combine(PackagesDirectory, "SampleViewExtension");