Package updates.

Build updates.
weblfe · Dec 25, 2018 · 97aa856 · 97aa856
1 parent 9c1c433
commit 97aa856
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/Build/Targets/PackageVersions.targets b/Build/Targets/PackageVersions.targets
@@ -6,13 +6,14 @@
         <MicrosoftBuildVersion>15.9.20</MicrosoftBuildVersion>
         <MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesVersion>
         <MicrosoftNETTestSdkVersion>15.9.0</MicrosoftNETTestSdkVersion>
+        <MicrosoftTestPlatformObjectModelVersion>15.9.0</MicrosoftTestPlatformObjectModelVersion>
         <MicrosoftVisualStudioSDKEmbedInteropTypesVersion>15.0.27</MicrosoftVisualStudioSDKEmbedInteropTypesVersion>
         <MicrosoftVisualStudioSetupConfigurationInteropVersion>1.16.30</MicrosoftVisualStudioSetupConfigurationInteropVersion>
         <MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
         <MSTestVersion>1.4.0</MSTestVersion>
         <NuGetVersion>4.8.0</NuGetVersion>
         <NUnitVersion>3.11.0</NUnitVersion>
-        <NUnit3TestAdapterVersion>3.11.2</NUnit3TestAdapterVersion>
+        <NUnit3TestAdapterVersion>3.12.0</NUnit3TestAdapterVersion>
         <RoslynAnalyzersVersion>2.6.2</RoslynAnalyzersVersion>
     </PropertyGroup>
 
@@ -26,6 +27,7 @@
         <PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
         <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesVersion)" />
         <PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+        <PackageReference Update="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformObjectModelVersion)" />
         <PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="$(MicrosoftVisualStudioSDKEmbedInteropTypesVersion)" />
         <PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
         <PackageReference Update="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" />

diff --git a/Tests/Cosmos.TestRunner.TestAdapter/Cosmos.TestRunner.TestAdapter.csproj b/Tests/Cosmos.TestRunner.TestAdapter/Cosmos.TestRunner.TestAdapter.csproj
@@ -3,40 +3,17 @@
     <PropertyGroup>
         <TargetFramework>netcoreapp2.0</TargetFramework>
         <PackageDescription>Test adapter for Cosmos kernels.</PackageDescription>
-        <DevelopmentDependency>True</DevelopmentDependency>
+        <IsToolProject>True</IsToolProject>
+        <AppendTargetFrameworkToToolsPackageFolder>False</AppendTargetFrameworkToToolsPackageFolder>
         <NoWarn>NU5111;$(NoWarn)</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.7.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.TestPlatform.ObjectModel" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\Cosmos.TestRunner.Core\Cosmos.TestRunner.Core.csproj" />
     </ItemGroup>
 
-    <PropertyGroup>
-        <IncludeBuildOutput>False</IncludeBuildOutput>
-        <!-- NuGet 4.8+ -->
-        <SuppressDependenciesWhenPacking>True</SuppressDependenciesWhenPacking>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackTestAdapter</TargetsForTfmSpecificContentInPackage>
-    </PropertyGroup>
-
-    <Target Name="PackTestAdapter" DependsOnTargets="Publish">
-
-        <ItemGroup>
-            <_GeneratedFiles Include="$(PublishDepsFilePath)" />
-        </ItemGroup>
-
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_GeneratedFiles)">
-                <PackagePath>tools\%(_GeneratedFiles.RecursiveDir)%(_GeneratedFiles.Filename)%(_GeneratedFiles.Extension)</PackagePath>
-            </TfmSpecificPackageFile>
-            <TfmSpecificPackageFile Include="@(ResolvedFileToPublish->'$([MSBuild]::NormalizeDirectory($(PublishDir)))%(RelativePath)')">
-                <PackagePath>tools\%(ResolvedFileToPublish.RelativePath)</PackagePath>
-            </TfmSpecificPackageFile>
-        </ItemGroup>
-
-    </Target>
-
 </Project>