Build all src in Linux (#1920)

2023-12-11 20:55:26 +01:00 · 2023-12-11 20:55:26 +01:00 · 197b50d156
--- a/.editorconfig
+++ b/.editorconfig
@ -49,7 +49,9 @@ insert_final_newline = true
 trim_trailing_whitespace = true

 [*.{cs,vb}]
-end_of_line = crlf
+
+# Do not set end_of_line property, this is causing issues with Linux,
+# see https://github.com/dotnet/roslyn/issues/55526

 #### .NET Coding Conventions ####

@ -71,8 +73,6 @@ file_header_template = Copyright (c) Microsoft Corporation. All rights reserved.

 ## Styling conventions

-end_of_line = crlf
-
 csharp_indent_labels = one_less_than_current
 csharp_prefer_braces = true:silent
 csharp_prefer_simple_default_expression = true:suggestion
--- a/.gitattributes
+++ b/.gitattributes
@ -1,7 +1,11 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto
+ * text=auto encoding=UTF-8 
+
+*.sh text=auto eol=lf
+*.cmd text=auto eol=crlf
+*.bat text=auto eol=crlf

 ###############################################################################
 # Set default behavior for command prompt diff.
@ -10,7 +14,8 @@
 # default for csharp files.
 # Note: This is only used by command line
 ###############################################################################
-#*.cs     diff=csharp
+ *.cs     diff=csharp text  
+ *.vb     text 

 ###############################################################################
 # Set the merge driver for project and solution files
@ -61,7 +66,3 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
-
-# Force bash scripts to always use lf line endings so that if a repo is accessed
-# in Unix via a file share from Windows, the scripts will work.
-*.sh text eol=lf
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@ -1,101 +1,101 @@
-id: 
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner: 
-resource: repository
-disabled: false
-where: 
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 6
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: 'Needs: Author Feedback'
-      - hasLabel:
-          label: 'State: No Recent Activity'
-      - noActivitySince:
-          days: 10
-      actions:
-      - closeIssue
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 6
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: 'Needs: Author Feedback'
-      - noActivitySince:
-          days: 4
-      - isNotLabeledWith:
-          label: 'State: No Recent Activity'
-      actions:
-      - addLabel:
-          label: 'State: No Recent Activity'
-      - addReply:
-          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 10 days of this comment**.
-    - description: 
-      frequencies:
-      - hourly:
-          hour: 6
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: 'Resolution: Duplicate'
-      - noActivitySince:
-          days: 1
-      actions:
-      - addReply:
-          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
-      - closeIssue
-    eventResponderTasks:
-    - if:
-      - payloadType: Issue_Comment
-      - isAction:
-          action: Created
-      - isActivitySender:
-          issueAuthor: True
-      - hasLabel:
-          label: 'Needs: Author Feedback'
-      - isOpen
-      then:
-      - addLabel:
-          label: 'Needs: Attention :wave:'
-      - removeLabel:
-          label: 'Needs: Author Feedback'
-      description: 
-    - if:
-      - payloadType: Issues
-      - not:
-          isAction:
-            action: Closed
-      - hasLabel:
-          label: 'State: No Recent Activity'
-      then:
-      - removeLabel:
-          label: 'State: No Recent Activity'
-      description: 
-    - if:
-      - payloadType: Issue_Comment
-      - hasLabel:
-          label: 'State: No Recent Activity'
-      then:
-      - removeLabel:
-          label: 'State: No Recent Activity'
-      description: 
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - inPrLabel:
-          label: 'State: In-PR'
-      description: 
-onFailure: 
-onSuccess: 
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'Needs: Author Feedback'
+      - hasLabel:
+          label: 'State: No Recent Activity'
+      - noActivitySince:
+          days: 10
+      actions:
+      - closeIssue
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'Needs: Author Feedback'
+      - noActivitySince:
+          days: 4
+      - isNotLabeledWith:
+          label: 'State: No Recent Activity'
+      actions:
+      - addLabel:
+          label: 'State: No Recent Activity'
+      - addReply:
+          reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 10 days of this comment**.
+    - description: 
+      frequencies:
+      - hourly:
+          hour: 6
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: 'Resolution: Duplicate'
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Issue_Comment
+      - isAction:
+          action: Created
+      - isActivitySender:
+          issueAuthor: True
+      - hasLabel:
+          label: 'Needs: Author Feedback'
+      - isOpen
+      then:
+      - addLabel:
+          label: 'Needs: Attention :wave:'
+      - removeLabel:
+          label: 'Needs: Author Feedback'
+      description: 
+    - if:
+      - payloadType: Issues
+      - not:
+          isAction:
+            action: Closed
+      - hasLabel:
+          label: 'State: No Recent Activity'
+      then:
+      - removeLabel:
+          label: 'State: No Recent Activity'
+      description: 
+    - if:
+      - payloadType: Issue_Comment
+      - hasLabel:
+          label: 'State: No Recent Activity'
+      then:
+      - removeLabel:
+          label: 'State: No Recent Activity'
+      description: 
+    - if:
+      - payloadType: Pull_Request
+      then:
+      - inPrLabel:
+          label: 'State: In-PR'
+      description: 
+onFailure: 
+onSuccess: 
--- a/Directory.Build.Local.targets
+++ b/Directory.Build.Local.targets
@ -2,14 +2,6 @@

  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

-  <!-- Linux properties -->
-  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <!-- Force setting TargetFrameworks only if it was set -->
-    <TargetFrameworks Condition=" '$(TargetFrameworks)' != '' ">$(NetCurrent)</TargetFrameworks>
-    <!-- Force setting TargetFramework only if it was set -->
-    <TargetFramework Condition=" '$(TargetFramework)' != '' ">$(NetCurrent)</TargetFramework>
-  </PropertyGroup>
-
  <PropertyGroup Condition=" '$(UseAssemblyVersion14)' == 'true' ">
    <!--
      It appears that AssemblyVersion should always be set to 14.0.0.0 for some backward compatibility cases,
--- a/eng/Build.props
+++ b/eng/Build.props
@ -5,9 +5,9 @@
  </ItemGroup>

  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <ProjectToBuild Include="$(RepoRoot)src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" />
-    <ProjectToBuild Include="$(RepoRoot)test\UnitTests\Microsoft.Testing.Platform.UnitTests\Microsoft.Testing.Platform.UnitTests.csproj" />
-    <ProjectToBuild Include="$(RepoRoot)test\IntegrationTests\Microsoft.Testing.Platform.Acceptance.IntegrationTests\Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)src/**/*.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/UnitTests/Microsoft.Testing.Platform.UnitTests/Microsoft.Testing.Platform.UnitTests.csproj" />
+    <ProjectToBuild Include="$(RepoRoot)test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests.csproj" />
  </ItemGroup>

 </Project>
--- a/eng/common/dotnet-install.sh
+++ b/eng/common/dotnet-install.sh
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.Linux.nuspec
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.Linux.nuspec
@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    $CommonMetadataElements$
+    <dependencies>
+      <group targetFramework="netstandard2.0">
+        <dependency id="Microsoft.Testing.Platform.Extensions.VSTestBridge" version="$TestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="$TestingPlatformVersion$" />
+      </group>
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="Microsoft.Testing.Platform.Extensions.VSTestBridge" version="$TestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="$TestingPlatformVersion$" />
+      </group>
+      <group targetFramework="net6.0">
+        <dependency id="Microsoft.Testing.Platform.Extensions.VSTestBridge" version="$TestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="$TestingPlatformVersion$" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="Microsoft.Testing.Platform.Extensions.VSTestBridge" version="$TestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="$TestingPlatformVersion$" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.Testing.Platform.Extensions.VSTestBridge" version="$TestingPlatformVersion$" />
+        <dependency id="Microsoft.Testing.Platform.MSBuild" version="$TestingPlatformVersion$" />
+      </group>
+    </dependencies>
+    <readme>PACKAGE.md</readme>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- netstandard2.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netstandard2.0\" />
+
+    <!-- netcoreapp3.1 -->
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netcoreapp3.1\" />
+
+    <!-- net6.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
+    <file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net6.0\" />
+
+    <!-- net7.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net7.0\" />
+    <file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net7.0\" />
+
+    <!-- net8.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\Common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net8.0\" />
+
+    <!-- Localization -->
+    <!-- All TFMs share the same resx + TestAdapter depends on PlatformServices + TestFramework so all resources are available -->
+    <file src="net6.0\**\*.resources.dll" target="\build\_localization\" />
+
+    <!-- Source code -->
+    <file src="$srcroot$\**\*.cs" target="src" />
+
+    <file src="$RepoRoot$src\Adapter\MSTest.TestAdapter\PACKAGE.md" target="" />
+  </files>
+</package>
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
@ -1,14 +1,20 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project>
+
+  <!-- SDK top import -->
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

  <PropertyGroup>
-    <TargetFrameworks>$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <UseAssemblyVersion14>true</UseAssemblyVersion14>
  </PropertyGroup>

  <PropertyGroup>
    <IsPackable>true</IsPackable>
-    <NuspecFile>MSTest.TestAdapter.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' == 'Windows_NT' ">MSTest.TestAdapter.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' != 'Windows_NT' ">MSTest.TestAdapter.Linux.nuspec</NuspecFile>
    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
    <PackageId>MSTest.TestAdapter</PackageId>
    <PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
@ -79,4 +85,8 @@
    </None>
  </ItemGroup>

+  <!-- SDK bottom import -->
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
+
 </Project>
--- a/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj
+++ b/src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj
@ -1,7 +1,12 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project>
+
+  <!-- SDK top import -->
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

  <PropertyGroup>
-    <TargetFrameworks>$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <UseAssemblyVersion14>true</UseAssemblyVersion14>
  </PropertyGroup>
@ -65,4 +70,8 @@
    </EmbeddedResource>
  </ItemGroup>

+  <!-- SDK bottom import -->
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
+
 </Project>
--- a/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj
+++ b/src/Analyzers/MSTest.Analyzers.Package/MSTest.Analyzers.Package.csproj
@ -4,7 +4,7 @@
    <TargetFramework>netstandard2.0</TargetFramework>
    <IncludeBuildOutput>false</IncludeBuildOutput>
    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild Condition=" '$(OS)' == 'Windows_NT' ">true</GeneratePackageOnBuild>
  </PropertyGroup>

  <PropertyGroup>
--- a/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.csproj
+++ b/src/Package/MSTest.Internal.TestFx.Documentation/MSTest.Internal.TestFx.Documentation.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
  </PropertyGroup>

  <PropertyGroup>
-    <IsPackable>true</IsPackable>
+    <IsPackable Condition=" '$(OS)' == 'Windows_NT' ">true</IsPackable>
    <IsShippingPackage>false</IsShippingPackage>
    <NuspecFile>MSTest.Internal.TestFx.Documentation.nuspec</NuspecFile>
    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
--- a/src/Package/MSTest/MSTest.Linux.nuspec
+++ b/src/Package/MSTest/MSTest.Linux.nuspec
@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    $CommonMetadataElements$
+    <dependencies>
+      <group targetFramework="netstandard2.0">
+        <dependency id="MSTest.TestAdapter" version="[$version$]" />
+        <dependency id="MSTest.TestFramework" version="[$version$]" />
+        <dependency id="MSTest.Analyzers" version="[$version$]" />
+        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
+      </group>
+
+      <group targetFramework="netcoreapp3.1">
+        <dependency id="MSTest.TestAdapter" version="[$version$]" />
+        <dependency id="MSTest.TestFramework" version="[$version$]" />
+        <dependency id="MSTest.Analyzers" version="[$version$]" />
+        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
+      </group>
+
+      <group targetFramework="net6.0">
+        <dependency id="MSTest.TestAdapter" version="[$version$]" />
+        <dependency id="MSTest.TestFramework" version="[$version$]" />
+        <dependency id="MSTest.Analyzers" version="[$version$]" />
+        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
+      </group>
+
+      <group targetFramework="net7.0">
+        <dependency id="MSTest.TestAdapter" version="[$version$]" />
+        <dependency id="MSTest.TestFramework" version="[$version$]" />
+        <dependency id="MSTest.Analyzers" version="[$version$]" />
+        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
+      </group>
+
+      <group targetFramework="net8.0">
+        <dependency id="MSTest.TestAdapter" version="[$version$]" />
+        <dependency id="MSTest.TestFramework" version="[$version$]" />
+        <dependency id="MSTest.Analyzers" version="[$version$]" />
+        <dependency id="Microsoft.NET.Test.Sdk" version="$TestPlatformVersion$" />
+      </group>
+    </dependencies>
+  </metadata>
+  <files>
+    $CommonFileElements$
+  </files>
+</package>
--- a/src/Package/MSTest/MSTest.csproj
+++ b/src/Package/MSTest/MSTest.csproj
@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
  </PropertyGroup>

  <PropertyGroup>
    <IsPackable>true</IsPackable>
-    <NuspecFile>MSTest.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' == 'Windows_NT' ">MSTest.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' != 'Windows_NT' ">MSTest.Linux.nuspec</NuspecFile>
    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
    <PackageId>MSTest</PackageId>
    <PackageTags>MSTest TestFramework TestAdapter VisualStudio Unittest MSTestV2 Microsoft</PackageTags>
--- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.Linux.nuspec
+++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.Linux.nuspec
@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    $CommonMetadataElements$
+    <dependencies>
+      <group targetFramework="netstandard2.0" />
+      <group targetFramework="netcoreapp3.1" />
+      <group targetFramework="net6.0" />
+      <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
+    </dependencies>
+    <readme>PACKAGE.md</readme>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- netstandard2.0 -->
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\netstandard2.0\" />
+
+    <!-- netcoreapp3.1 -->
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="lib\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="lib\netcoreapp3.1\" />
+
+    <!-- net6.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestFramework.targets" target="build\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net6.0\" />
+    <file src="net6.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net6.0\" />
+    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net6.0\" />
+
+    <!-- net7.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestFramework.targets" target="build\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net7.0\" />
+    <file src="net7.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net7.0\" />
+    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net7.0\" />
+
+    <!-- net8.0 -->
+    <file src="$RepoRoot$src\Adapter\Build\NetWithWinUI\MSTest.TestFramework.targets" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net8.0\" />
+    <file src="net8.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\" />
+    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\" />
+
+    <!-- Source code -->
+    <file src="$srcroot$\**\*.cs" target="src" />
+
+    <file src="$RepoRoot$src\TestFramework\TestFramework.Extensions\PACKAGE.md" target="" />
+  </files>
+</package>
--- a/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
+++ b/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 #if NETFRAMEWORK
--- a/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
+++ b/src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj
@ -1,14 +1,20 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project>
+
+  <!-- SDK top import -->
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />

  <PropertyGroup>
-    <TargetFrameworks>$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(UwpMinimum);$(WinUiMinimum);netstandard2.0;$(NetFrameworkMinimum);$(SupportedNetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(SupportedNetFrameworks);netstandard2.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <UseAssemblyVersion14>true</UseAssemblyVersion14>
  </PropertyGroup>

  <PropertyGroup>
    <IsPackable>true</IsPackable>
-    <NuspecFile>MSTest.TestFramework.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' == 'Windows_NT' ">MSTest.TestFramework.nuspec</NuspecFile>
+    <NuspecFile Condition=" '$(OS)' != 'Windows_NT' ">MSTest.TestFramework.Linux.nuspec</NuspecFile>
    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
    <PackageId>MSTest.TestFramework</PackageId>
    <PackageTags>MSTest TestFramework Unittest MSTestV2 Microsoft Test Testing TDD Framework</PackageTags>
@ -75,4 +81,8 @@
    <NuspecProperty Include="RepoRoot=$(RepoRoot)" />
  </ItemGroup>

+  <!-- SDK bottom import -->
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Condition=" '$(OS)' == 'Windows_NT' " />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition=" '$(OS)' != 'Windows_NT' " />
+
 </Project>