Fix conflict with Microsoft.Win32.Registry (#3988)

2024-11-04 14:11:18 +01:00 · 2024-11-04 14:11:18 +01:00 · b4b45b46af
--- a/TestFx.sln
+++ b/TestFx.sln
@ -207,6 +207,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Testing.Extension
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Testing.Platform.MSBuild.UnitTests", "test\UnitTests\Microsoft.Testing.Platform.MSBuild.UnitTests\Microsoft.Testing.Platform.MSBuild.UnitTests.csproj", "{F422398C-72CD-43EA-AC8E-E0DBD08E5563}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Testing.Extensions.MSBuild", "src\Platform\Microsoft.Testing.Extensions.MSBuild\Microsoft.Testing.Extensions.MSBuild.csproj", "{8CE782A2-7374-4916-9C69-1F87E51A64A9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -477,6 +479,10 @@ Global
 		{F422398C-72CD-43EA-AC8E-E0DBD08E5563}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F422398C-72CD-43EA-AC8E-E0DBD08E5563}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F422398C-72CD-43EA-AC8E-E0DBD08E5563}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CE782A2-7374-4916-9C69-1F87E51A64A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE782A2-7374-4916-9C69-1F87E51A64A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE782A2-7374-4916-9C69-1F87E51A64A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CE782A2-7374-4916-9C69-1F87E51A64A9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -560,6 +566,7 @@ Global
 		{16FEFD31-B0D6-4291-B620-F902A16F39DC} = {BB874DF1-44FE-415A-B634-A6B829107890}
 		{573C617F-6BB2-403A-AD87-E00A7FD537F0} = {BB874DF1-44FE-415A-B634-A6B829107890}
 		{F422398C-72CD-43EA-AC8E-E0DBD08E5563} = {BB874DF1-44FE-415A-B634-A6B829107890}
+		{8CE782A2-7374-4916-9C69-1F87E51A64A9} = {6AEE1440-FDF0-4729-8196-B24D0E333550}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildCommandLine.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildCommandLine.cs
@ -6,27 +6,26 @@ using Microsoft.Testing.Platform.Extensions;
 using Microsoft.Testing.Platform.Extensions.CommandLine;
 using Microsoft.Testing.Platform.Helpers;

-namespace Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions;
+namespace Microsoft.Testing.Extensions.MSBuild;

 internal sealed class MSBuildCommandLineProvider : ICommandLineOptionsProvider
 {
-    public const string MSBuildNodeOptionKey = "internal-msbuild-node";
-
    public string Uid => nameof(MSBuildCommandLineProvider);

    public string Version => AppVersion.DefaultSemVer;

    public string DisplayName => nameof(MSBuildCommandLineProvider);

-    public string Description => Resources.MSBuildResources.MSBuildExtensionsDescription;
+    public string Description => Resources.ExtensionResources.MSBuildExtensionsDescription;

    public IReadOnlyCollection<CommandLineOption> GetCommandLineOptions()
        =>
        [
-            new(MSBuildNodeOptionKey, "Used to pass the msbuild node handle", ArgumentArity.ExactlyOne, isHidden: true, isBuiltIn: true)
+            new(MSBuildConstants.MSBuildNodeOptionKey, "Used to pass the MSBuild node handle", ArgumentArity.ExactlyOne, isHidden: true, isBuiltIn: true)
        ];

-    public Task<bool> IsEnabledAsync() => Task.FromResult(true);
+    public Task<bool> IsEnabledAsync()
+        => Task.FromResult(true);

    public Task<ValidationResult> ValidateCommandLineOptionsAsync(ICommandLineOptions commandLineOptions)
        => ValidationResult.ValidTask;
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConstants.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConstants.cs
@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.Testing.Extensions.MSBuild;
+
+internal static class MSBuildConstants
+{
+    public const string MSBuildNodeOptionKey = "internal-msbuild-node";
+}
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildConsumer.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildConsumer.cs
@ -4,18 +4,18 @@
 using System.Globalization;
 using System.Text;

+using Microsoft.Testing.Extensions.MSBuild.Serializers;
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Extensions.TestHost;
 using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.IPC.Models;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
 using Microsoft.Testing.Platform.Services;
 using Microsoft.Testing.Platform.TestHost;

-namespace Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions;
+namespace Microsoft.Testing.Extensions.MSBuild;

-internal class MSBuildConsumer : IDataConsumer, ITestSessionLifetimeHandler
+internal sealed class MSBuildConsumer : IDataConsumer, ITestSessionLifetimeHandler
 {
    private readonly IServiceProvider _serviceProvider;
    private readonly ICommandLineOptions _commandLineOptions;
@ -44,10 +44,10 @@ internal class MSBuildConsumer : IDataConsumer, ITestSessionLifetimeHandler

    public string DisplayName => nameof(MSBuildConsumer);

-    public string Description => Resources.MSBuildResources.MSBuildExtensionsDescription;
+    public string Description => Resources.ExtensionResources.MSBuildExtensionsDescription;

    public Task<bool> IsEnabledAsync()
-        => Task.FromResult(_commandLineOptions.IsOptionSet(MSBuildCommandLineProvider.MSBuildNodeOptionKey));
+        => Task.FromResult(_commandLineOptions.IsOptionSet(MSBuildConstants.MSBuildNodeOptionKey));

    public Task OnTestSessionStartingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
    {
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildExtensions.cs
@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

+using Microsoft.Testing.Extensions.MSBuild;
 using Microsoft.Testing.Platform.Builder;
 using Microsoft.Testing.Platform.Extensions;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions;
 using Microsoft.Testing.Platform.Services;

 namespace Microsoft.Testing.Platform.MSBuild;
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildTestApplicationLifecycleCallbacks.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/MSBuildTestApplicationLifecycleCallbacks.cs
@ -3,6 +3,7 @@

 using System.Runtime.InteropServices;

+using Microsoft.Testing.Extensions.MSBuild.Serializers;
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Configurations;
 using Microsoft.Testing.Platform.Extensions.TestHost;
@ -10,13 +11,11 @@ using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.IPC;
 using Microsoft.Testing.Platform.IPC.Models;
 using Microsoft.Testing.Platform.IPC.Serializers;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
 using Microsoft.Testing.Platform.Services;

-namespace Microsoft.Testing.Platform.MSBuild;
+namespace Microsoft.Testing.Extensions.MSBuild;

-internal class MSBuildTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable
+internal sealed class MSBuildTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable
 {
    private readonly IConfiguration _configuration;
    private readonly ICommandLineOptions _commandLineOptions;
@ -40,21 +39,21 @@ internal class MSBuildTestApplicationLifecycleCallbacks : ITestApplicationLifecy

    public string DisplayName => nameof(MSBuildTestApplicationLifecycleCallbacks);

-    public string Description => Resources.MSBuildResources.MSBuildExtensionsDescription;
+    public string Description => Resources.ExtensionResources.MSBuildExtensionsDescription;

    public Task<bool> IsEnabledAsync()
-        => Task.FromResult(_commandLineOptions.IsOptionSet(MSBuildCommandLineProvider.MSBuildNodeOptionKey));
+        => Task.FromResult(_commandLineOptions.IsOptionSet(MSBuildConstants.MSBuildNodeOptionKey));

    public async Task BeforeRunAsync(CancellationToken cancellationToken)
    {
-        if (!_commandLineOptions.TryGetOptionArgumentList(MSBuildCommandLineProvider.MSBuildNodeOptionKey, out string[]? msbuildInfo))
+        if (!_commandLineOptions.TryGetOptionArgumentList(MSBuildConstants.MSBuildNodeOptionKey, out string[]? msbuildInfo))
        {
-            throw new InvalidOperationException($"MSBuild pipe name not found in the command line, missing {MSBuildCommandLineProvider.MSBuildNodeOptionKey}");
+            throw new InvalidOperationException($"MSBuild pipe name not found in the command line, missing {MSBuildConstants.MSBuildNodeOptionKey}");
        }

        if (msbuildInfo is null || msbuildInfo.Length != 1 || string.IsNullOrEmpty(msbuildInfo[0]))
        {
-            throw new InvalidOperationException($"MSBuild pipe name not found in the command line, missing argument for {MSBuildCommandLineProvider.MSBuildNodeOptionKey}");
+            throw new InvalidOperationException($"MSBuild pipe name not found in the command line, missing argument for {MSBuildConstants.MSBuildNodeOptionKey}");
        }

        PipeClient = new(msbuildInfo[0]);
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Microsoft.Testing.Extensions.MSBuild.csproj
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Microsoft.Testing.Extensions.MSBuild.csproj
@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(MicrosoftTestingTargetFrameworks);netstandard2.0</TargetFrameworks>
+    <!-- Packaged as part of Microsoft.Testing.Platform.MSBuild -->
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Testing.Platform.MSBuild.UnitTests" Key="$(VsPublicKey)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Resources\ExtensionResources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ExtensionResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\ExtensionResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ExtensionResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/ExtensionResources.Designer.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/ExtensionResources.Designer.cs
@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Testing.Extensions.MSBuild.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class ExtensionResources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal ExtensionResources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Testing.Extensions.MSBuild.Resources.ExtensionResources", typeof(ExtensionResources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extension used to pass parameters from MSBuild node and the hosts.
+        /// </summary>
+        internal static string MSBuildExtensionsDescription {
+            get {
+                return ResourceManager.GetString("MSBuildExtensionsDescription", resourceCulture);
+            }
+        }
+    }
+}
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/ExtensionResources.resx
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/ExtensionResources.resx
@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MSBuildExtensionsDescription" xml:space="preserve">
+    <value>Extension used to pass parameters from MSBuild node and the hosts</value>
+  </data>
+</root>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.cs.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.cs.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="cs" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Rozšíření používané k předání parametrů z uzlu MSBuild a hostitelů</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.de.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.de.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="de" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Erweiterung, die zum Übergeben von Parametern vom MSBuild-Knoten und den Hosts verwendet wird.</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.es.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.es.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="es" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Extensión usada para pasar parámetros desde el nodo de MSBuild y los hosts</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.fr.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.fr.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="fr" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Extension utilisée pour passer des paramètres entre le nœud MSBuild et les hôtes</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.it.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.it.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="it" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Estensione usata per passare parametri dal nodo MSBuild e dagli host</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ja.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ja.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ja" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">MSBuild ノードおよびホストからパラメーターを渡すために使用される拡張機能</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ko.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ko.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ko" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">MSBuild 노드 및 호스트에서 매개 변수를 전달하는 데 사용되는 확장</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.pl.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.pl.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pl" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Rozszerzenie używane do przekazywania parametrów z węzła MSBuild i hostów</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.pt-BR.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.pt-BR.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="pt-BR" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Extensão usada para passar parâmetros do nó do MSBuild e dos hosts</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ru.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.ru.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="ru" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">Расширение, используемое для передачи параметров с узла MSBuild и из основных элементов</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.tr.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.tr.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="tr" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">MSBuild düğümünden ve konaklardan parametreleri geçirmek için kullanılan uzantı</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.zh-Hans.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.zh-Hans.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hans" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">用于从 MSBuild 节点和主机传递参数的扩展</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.zh-Hant.xlf
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/Resources/xlf/ExtensionResources.zh-Hant.xlf
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="en" target-language="zh-Hant" original="../ExtensionResources.resx">
+    <body>
+      <trans-unit id="MSBuildExtensionsDescription">
+        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
+        <target state="translated">用於從 MSBuild 節點和主機傳遞參數的延伸模組</target>
+        <note />
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/FailedTestInfoRequestSerializer.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/FailedTestInfoRequestSerializer.cs
@ -4,7 +4,7 @@
 using Microsoft.Testing.Platform.IPC;
 using Microsoft.Testing.Platform.IPC.Serializers;

-namespace Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
+namespace Microsoft.Testing.Extensions.MSBuild.Serializers;

 internal record FailedTestInfoRequest(
    string DisplayName,
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/ModuleInfoRequestSerializer.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/ModuleInfoRequestSerializer.cs
@ -4,7 +4,7 @@
 using Microsoft.Testing.Platform.IPC;
 using Microsoft.Testing.Platform.IPC.Serializers;

-namespace Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
+namespace Microsoft.Testing.Extensions.MSBuild.Serializers;

 internal record ModuleInfoRequest(string FrameworkDescription, string ProcessArchitecture, string TestResultFolder) : IRequest;

--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/RunSummaryRequestSerializer.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/Serializers/RunSummaryRequestSerializer.cs
@ -4,7 +4,7 @@
 using Microsoft.Testing.Platform.IPC;
 using Microsoft.Testing.Platform.IPC.Serializers;

-namespace Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
+namespace Microsoft.Testing.Extensions.MSBuild.Serializers;

 internal record RunSummaryInfoRequest(
    int Total,
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/TestingPlatformBuilderHook.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/TestPlatformExtensions/TestingPlatformBuilderHook.cs
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFrameworks>$(MicrosoftTestingTargetFrameworks);netstandard2.0</TargetFrameworks>
    <DefineConstants>PLATFORM_MSBUILD</DefineConstants>
@ -17,10 +17,16 @@

  <ItemGroup>
    <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Platform\Microsoft.Testing.Platform.csproj" />
+    <!-- Deps only so we can include it in the lib of the NuGet package -->
+    <ProjectReference Include="$(RepoRoot)\src\Platform\Microsoft.Testing.Extensions.MSBuild\Microsoft.Testing.Extensions.MSBuild.csproj" PrivateAssets="All" />
  </ItemGroup>

  <!-- NuGet properties -->
  <PropertyGroup>
+    <NuspecFile>Microsoft.Testing.Platform.MSBuild.nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)</NuspecBasePath>
+    <PackageId>Microsoft.Testing.Platform.MSBuild</PackageId>
+    <PackageTags>$(CommonPackageTags)</PackageTags>
    <PackageDescription>
      <![CDATA[Microsoft Testing is a set of platform, framework and protocol intended to make it possible to run any test on any target or device.

@ -28,39 +34,16 @@ This package provides MSBuild integration of the platform, its extensions and co
    </PackageDescription>
  </PropertyGroup>

-  <!-- NuGet package layout -->
-  <!-- NuGet folders https://learn.microsoft.com/nuget/create-packages/creating-a-package#from-a-convention-based-working-directory -->
-  <ItemGroup>
-    <Content Include="buildMultiTargeting/**">
-      <Pack>true</Pack>
-      <PackagePath>buildMultiTargeting</PackagePath>
-    </Content>
-    <TfmSpecificPackageFile Include="buildTransitive/**">
-      <PackagePath>buildTransitive/$(TargetFramework)</PackagePath>
-    </TfmSpecificPackageFile>
-    <TfmSpecificPackageFile Include="build/**">
-      <PackagePath>build/$(TargetFramework)</PackagePath>
-    </TfmSpecificPackageFile>
+  <ItemGroup Label="NuGet">
+    <NuspecProperty Include="RepoRoot=$(RepoRoot)" />
  </ItemGroup>

-  <!--
-        Test task depends on Microsoft.Testing.Platform.dll and we need to pack with it and move to custom
-        folder to not confuse nuget with same assembly references.
-  -->
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CustomContentTarget</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-
-  <Target Name="CustomContentTarget" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)Microsoft.Testing.Platform.dll">
-        <PackagePath>_MSBuildTasks/$(TargetFramework)</PackagePath>
-      </TfmSpecificPackageFile>
-      <TfmSpecificPackageFile Include="$(OutputPath)Microsoft.Testing.Platform.MSBuild.dll">
-        <PackagePath>_MSBuildTasks/$(TargetFramework)</PackagePath>
-      </TfmSpecificPackageFile>
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <Compile Include="..\Microsoft.Testing.Extensions.MSBuild\MSBuildConstants.cs" Link="MSBuildConstants.cs" />
+    <Compile Include="..\Microsoft.Testing.Extensions.MSBuild\Serializers\FailedTestInfoRequestSerializer.cs" Link="Serializers/FailedTestInfoRequestSerializer.cs" />
+    <Compile Include="..\Microsoft.Testing.Extensions.MSBuild\Serializers\ModuleInfoRequestSerializer.cs" Link="Serializers/ModuleInfoRequestSerializer.cs" />
+    <Compile Include="..\Microsoft.Testing.Extensions.MSBuild\Serializers\RunSummaryRequestSerializer.cs" Link="Serializers/RunSummaryRequestSerializer.cs" />
+  </ItemGroup>

  <ItemGroup>
    <Compile Update="Resources\MSBuildResources.Designer.cs">
@ -82,10 +65,11 @@ This package provides MSBuild integration of the platform, its extensions and co
      <MSBuildAssetsBuildTargeting Include="buildMultiTargeting/**" />
      <MSBuildAssetsBuildTransitive Include="buildTransitive/**" />
      <MSBuildAssetsBuild Include="build/**" />
-      <MSBuildLib Include="$(TargetDir)$(TargetName).dll" />
-      <MSBuildLib Include="$(MSBuildLib);$(TargetDir)Microsoft.Testing.Platform.dll" />
+      <MSBuildTaskLib Include="$(TargetDir)$(TargetName).dll" />
+      <MSBuildTaskLib Include="$(MSBuildTaskLib);$(TargetDir)Microsoft.Testing.Platform.dll" />
+      <MSBuildLib Include="$(TargetDir)Microsoft.Testing.Extensions.MSBuild.dll" />
      <!-- We ship with embedded symbols -->
-      <!--<MSBuildLib Include="$(TargetDir)$(TargetName).pdb" />-->
+      <!--<MSBuildTaskLib Include="$(TargetDir)$(TargetName).pdb" />-->
    </ItemGroup>

    <Message Text="MSBuildAssetsBuildTargeting tests: @(MSBuildAssetsBuildTargeting->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/buildMultiTargeting/%(RecursiveDir)%(Filename)%(Extension)')" Importance="low" />
@ -100,12 +84,24 @@ This package provides MSBuild integration of the platform, its extensions and co
    <Message Text="MSBuildLib tests: @(MSBuildLib->'$(ArtifactsDir)tests/nugetPackageFolder/lib/$(TargetFramework)/%(RecursiveDir)%(Filename)%(Extension)')" Importance="low" />
    <Copy SourceFiles="@(MSBuildLib)" DestinationFiles="@(MSBuildLib->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/lib/$(TargetFramework)/%(RecursiveDir)%(Filename)%(Extension)')" />

-    <Message Text="MSBuildLib to _MSBuildTasks: @(MSBuildLib->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/_MSBuildTasks/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)')" Importance="low" />
-    <Copy SourceFiles="@(MSBuildLib)" DestinationFiles="@(MSBuildLib->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/_MSBuildTasks/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)')" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
+    <Message Text="MSBuildTaskLib to _MSBuildTasks: @(MSBuildTaskLib->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/_MSBuildTasks/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)')" Importance="low" />
+    <Copy SourceFiles="@(MSBuildTaskLib)" DestinationFiles="@(MSBuildTaskLib->'$(ArtifactsDir)tests/nugetPackageFolder/$(AssemblyName)/_MSBuildTasks/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)')" Condition=" '$(TargetFramework)' == 'netstandard2.0' " />
  </Target>

  <ItemGroup>
    <Using Include="Polyfills" />
  </ItemGroup>

-</Project>
+  <ItemGroup>
+    <None Update="buildMultiTargeting\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="build\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="buildTransitive\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.nuspec
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Microsoft.Testing.Platform.MSBuild.nuspec
@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    $CommonMetadataElements$
+    <dependencies>
+      <group targetFramework="netstandard2.0">
+        <dependency id="Microsoft.Testing.Platform" version="$Version$" />
+      </group>
+      <group targetFramework="net6.0">
+        <dependency id="Microsoft.Testing.Platform" version="$Version$" />
+      </group>
+      <group targetFramework="net7.0">
+        <dependency id="Microsoft.Testing.Platform" version="$Version$" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.Testing.Platform" version="$Version$" />
+      </group>
+    </dependencies>
+    <readme>PACKAGE.md</readme>
+  </metadata>
+  <files>
+    $CommonFileElements$
+
+    <!-- netstandard2.0 -->
+    <file src="netstandard2.0\build\*" target="build\netstandard2.0" />
+    <file src="netstandard2.0\buildMultiTargeting\*" target="buildMultiTargeting" />
+    <file src="netstandard2.0\buildTransitive\*" target="buildTransitive\netstandard2.0" />
+    <file src="netstandard2.0\Microsoft.Testing.Platform.dll" target="_MSBuildTasks\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.Testing.Platform.MSBuild.dll" target="_MSBuildTasks\netstandard2.0\" />
+    <file src="netstandard2.0\**\Microsoft.Testing.Extensions.Platform.resources.*" target="_MSBuildTasks\netstandard2.0" />
+    <file src="netstandard2.0\Microsoft.Testing.Extensions.MSBuild.dll" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\Microsoft.Testing.Extensions.MSBuild.xml" target="lib\netstandard2.0\" />
+    <file src="netstandard2.0\**\Microsoft.Testing.Extensions.MSBuild.resources.*" target="lib\netstandard2.0" />
+
+    <!-- net6.0 -->
+    <file src="net6.0\build\*" target="build\net6.0" />
+    <file src="net6.0\buildTransitive\*" target="buildTransitive\net6.0" />
+    <file src="net6.0\Microsoft.Testing.Extensions.MSBuild.dll" target="lib\net6.0\" />
+    <file src="net6.0\Microsoft.Testing.Extensions.MSBuild.xml" target="lib\net6.0\" />
+    <file src="net6.0\**\Microsoft.Testing.Extensions.MSBuild.resources.*" target="lib\net6.0\" />
+
+    <!-- net7.0 -->
+    <file src="net7.0\build\*" target="build\net7.0" />
+    <file src="net7.0\buildTransitive\*" target="buildTransitive\net7.0" />
+    <file src="net7.0\Microsoft.Testing.Extensions.MSBuild.dll" target="lib\net7.0\" />
+    <file src="net7.0\Microsoft.Testing.Extensions.MSBuild.xml" target="lib\net7.0\" />
+    <file src="net7.0\**\Microsoft.Testing.Extensions.MSBuild.resources.*" target="lib\net7.0\" />
+
+    <!-- net8.0 -->
+    <file src="net8.0\build\*" target="build\net8.0" />
+    <file src="net8.0\buildTransitive\*" target="buildTransitive\net8.0" />
+    <file src="net8.0\Microsoft.Testing.Extensions.MSBuild.dll" target="lib\net8.0\" />
+    <file src="net8.0\Microsoft.Testing.Extensions.MSBuild.xml" target="lib\net8.0\" />
+    <file src="net8.0\**\Microsoft.Testing.Extensions.MSBuild.resources.*" target="lib\net8.0\" />
+
+    <!-- Source code -->
+    <file src="$srcroot$\**\*.cs" target="src" />
+
+    <file src="$RepoRoot$src\Platform\Microsoft.Testing.Platform.MSBuild\PACKAGE.md" target="" />
+  </files>
+</package>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/MSBuildResources.Designer.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/MSBuildResources.Designer.cs
@ -114,15 +114,6 @@ namespace Microsoft.Testing.Platform.MSBuild.Resources {
            }
        }
        
-        /// <summary>
-        ///   Looks up a localized string similar to Extension used to pass parameters from MSBuild node and the hosts.
-        /// </summary>
-        internal static string MSBuildExtensionsDescription {
-            get {
-                return ResourceManager.GetString("MSBuildExtensionsDescription", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   Looks up a localized string similar to Passed.
        /// </summary>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/MSBuildResources.resx
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/MSBuildResources.resx
@ -135,9 +135,6 @@
  <data name="InvalidTargetPath" xml:space="preserve">
    <value>Invalid TargetPath, {0}</value>
  </data>
-  <data name="MSBuildExtensionsDescription" xml:space="preserve">
-    <value>Extension used to pass parameters from MSBuild node and the hosts</value>
-  </data>
  <data name="Passed" xml:space="preserve">
    <value>Passed</value>
  </data>
@ -159,4 +156,4 @@
  <data name="TestsSucceeded" xml:space="preserve">
    <value>Tests succeeded: '{0}' [{1}|{2}]</value>
  </data>
-</root>
+</root>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.cs.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.cs.xlf
@ -32,11 +32,6 @@
        <target state="translated">Neplatná hodnota TargetPath, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Rozšíření používané k předání parametrů z uzlu MSBuild a hostitelů</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Úspěšné</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.de.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.de.xlf
@ -32,11 +32,6 @@
        <target state="translated">Ungültiger TargetPath, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Erweiterung, die zum Übergeben von Parametern vom MSBuild-Knoten und den Hosts verwendet wird.</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Bestanden</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.es.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.es.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath no válido, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Extensión usada para pasar parámetros desde el nodo de MSBuild y los hosts</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Correcta</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.fr.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.fr.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath non valide, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Extension utilisée pour passer des paramètres entre le nœud MSBuild et les hôtes</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Réussite</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.it.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.it.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath non valido, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Estensione usata per passare parametri dal nodo MSBuild e dagli host</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Superato</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ja.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ja.xlf
@ -32,11 +32,6 @@
        <target state="translated">無効な TargetPath、{0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">MSBuild ノードおよびホストからパラメーターを渡すために使用される拡張機能</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">成功</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ko.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ko.xlf
@ -32,11 +32,6 @@
        <target state="translated">잘못된 TargetPath, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">MSBuild 노드 및 호스트에서 매개 변수를 전달하는 데 사용되는 확장</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">통과</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.pl.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.pl.xlf
@ -32,11 +32,6 @@
        <target state="translated">Nieprawidłowa ścieżka docelowa, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Rozszerzenie używane do przekazywania parametrów z węzła MSBuild i hostów</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Powodzenie</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.pt-BR.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.pt-BR.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath inválido, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Extensão usada para passar parâmetros do nó do MSBuild e dos hosts</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Aprovado</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ru.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.ru.xlf
@ -32,11 +32,6 @@
        <target state="translated">Недопустимый TargetPath, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">Расширение, используемое для передачи параметров с узла MSBuild и из основных элементов</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Пройден</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.tr.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.tr.xlf
@ -32,11 +32,6 @@
        <target state="translated">Geçersiz TargetPath, {0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">MSBuild düğümünden ve konaklardan parametreleri geçirmek için kullanılan uzantı</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">Başarılı</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.zh-Hans.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.zh-Hans.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath {0} 无效</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">用于从 MSBuild 节点和主机传递参数的扩展</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">已通过</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.zh-Hant.xlf
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Resources/xlf/MSBuildResources.zh-Hant.xlf
@ -32,11 +32,6 @@
        <target state="translated">TargetPath 無效，{0}</target>
        <note />
      </trans-unit>
-      <trans-unit id="MSBuildExtensionsDescription">
-        <source>Extension used to pass parameters from MSBuild node and the hosts</source>
-        <target state="translated">用於從 MSBuild 節點和主機傳遞參數的延伸模組</target>
-        <note />
-      </trans-unit>
      <trans-unit id="Passed">
        <source>Passed</source>
        <target state="translated">成功</target>
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs
@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Text;

-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;
+using Microsoft.Testing.Extensions.MSBuild.Serializers;

 namespace Microsoft.Testing.Platform.MSBuild;

--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
@ -9,6 +9,8 @@ using System.Runtime.InteropServices;
 using System.Text;

 using Microsoft.Build.Framework;
+using Microsoft.Testing.Extensions.MSBuild;
+using Microsoft.Testing.Extensions.MSBuild.Serializers;
 using Microsoft.Testing.Platform.Configurations;
 using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.IPC;
@ -16,8 +18,6 @@ using Microsoft.Testing.Platform.IPC.Models;
 using Microsoft.Testing.Platform.IPC.Serializers;
 using Microsoft.Testing.Platform.Logging;
 using Microsoft.Testing.Platform.MSBuild.Tasks;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions;
-using Microsoft.Testing.Platform.MSBuild.TestPlatformExtensions.Serializers;

 using static Microsoft.Testing.Platform.MSBuild.Tasks.DotnetMuxerLocator;

@ -203,7 +203,7 @@ public class InvokeTestingPlatformTask : Build.Utilities.ToolTask, IDisposable
            }
        }

-        builder.AppendSwitchIfNotNull($"--{MSBuildCommandLineProvider.MSBuildNodeOptionKey} ", _pipeNameDescription.Name);
+        builder.AppendSwitchIfNotNull($"--{MSBuildConstants.MSBuildNodeOptionKey} ", _pipeNameDescription.Name);

        if (!string.IsNullOrEmpty(TestingPlatformCommandLineArguments?.ItemSpec))
        {
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets
@ -204,7 +204,7 @@
  </Target>

  <!-- We always include the entry point also if the task _GenerateAutoRegisteredExtensions is skipped for caching reason -->
-  <!-- !!! DO NOT CHANGE THE NAME OF THIS TARGET IS USED BY ADAPTERS https://github.com/microsoft/testfx/issues/3478#issuecomment-2313889212 !!! --> 
+  <!-- !!! DO NOT CHANGE THE NAME OF THIS TARGET IS USED BY ADAPTERS https://github.com/microsoft/testfx/issues/3478#issuecomment-2313889212 !!! -->
  <Target Name="_IncludeGenerateAutoRegisteredExtensionsIntoCompilation" BeforeTargets="_IncludeGenerateTestingPlatformEntryPointIntoCompilation;CoreCompile" Condition=" '$(GenerateSelfRegisteredExtensions)' == 'True' " >
    <ItemGroup>
      <Compile Include="$(_AutoRegisteredExtensionsSourcePath)" />
@ -227,7 +227,7 @@
  <!-- Import task -->
  <UsingTask TaskName="Microsoft.Testing.Platform.MSBuild.InvokeTestingPlatformTask"
         AssemblyFile="$(MicrosoftTestingPlatformMSBuildTaskFolder)Microsoft.Testing.Platform.MSBuild.dll"/>
-  
+
  <PropertyGroup>
    <!-- Disable custom -t:Test target -->
    <TestingPlatformDisableCustomTestTarget Condition=" '$(TestingPlatformDisableCustomTestTarget)' == '' ">False</TestingPlatformDisableCustomTestTarget>
@ -337,7 +337,7 @@
    When PublishContainer target is used to create a docker image for the test project, it will try to write /app/TestResults folder
    which is a non-writable folder. The environment variable below (notice double underscore) is used to override option defaults, and is picked up
    EnvironmentVariablesConfigurationProvider.
-    
+
    ComputeContainerConfig is target that PublishContainer depends on to figure out the configuration for the container.
    -->
    <ItemGroup>
--- a/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
+++ b/src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj
@ -54,23 +54,24 @@ This package provides the core platform and the .NET implementation of the proto
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.Experimental" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.HangDump" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.HotReload" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.MSBuild" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.Retry" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.Telemetry" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.TrxReport" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.UnitTests" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.TestAdapter" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.UnitTests" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework.UnitTests" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="MSTest.Engine" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="MSTest.Engine.UnitTests" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Platform.Acceptance.IntegrationTests" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="MSTest.Acceptance.IntegrationTests" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.UnitTests" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.UnitTests" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Platform.MSBuild" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.Platform.UnitTests" Key="$(VsPublicKey)" />
    <InternalsVisibleTo Include="Microsoft.Testing.TestInfrastructure" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="MSTest.Acceptance.IntegrationTests" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="MSTest.Engine" Key="$(VsPublicKey)" />
+    <InternalsVisibleTo Include="MSTest.Engine.UnitTests" Key="$(VsPublicKey)" />
  </ItemGroup>

  <ItemGroup>