Skip to content

Commit 3d6d7e8

Browse files
HaploisHaplois
committed
Moved projects to use PackageReference.
1 parent 0b95a26 commit 3d6d7e8

File tree

73 files changed

+958
-1402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+958
-1402
lines changed

‎TestFx.sln‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ EndProject
119119
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Portable.Unit.Tests", "test\UnitTests\PlatformServices.Portable.Unit.Tests\PlatformServices.Portable.Unit.Tests.csproj", "{E3C630FE-AF89-4C95-B1B9-2409B1107208}"
120120
EndProject
121121
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Universal.Unit.Tests", "test\UnitTests\PlatformServices.Universal.Unit.Tests\PlatformServices.Universal.Unit.Tests.csproj", "{FA7C719F-A400-45AF-8091-7C23435617A8}"
122+
ProjectSection(ProjectDependencies) = postProject
123+
{DF131865-84EE-4540-8112-E88ACEBDEA09} = {DF131865-84EE-4540-8112-E88ACEBDEA09}
124+
{5D153CAA-80C2-4551-9549-6C406FCEEFB1} = {5D153CAA-80C2-4551-9549-6C406FCEEFB1}
125+
EndProjectSection
122126
EndProject
123127
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTest.Core.Unit.Tests", "test\UnitTests\MSTest.Core.Unit.Tests\MSTest.Core.Unit.Tests.csproj", "{0A4A76DD-FEE1-4D04-926B-38E1A24A7ED2}"
124128
EndProject

‎samples/FxExtensibility/FxExtensibility.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TestFxRoot Condition="$(TestFxRoot) == ''">..\..\</TestFxRoot>
55
</PropertyGroup>
66
<Import Project="$(TestFxRoot)scripts\build\TestFx.Settings.targets" />
7+
78
<PropertyGroup>
89
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
910
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,7 +40,7 @@
3940
<Compile Include="Properties\AssemblyInfo.cs" />
4041
</ItemGroup>
4142
<ItemGroup>
42-
<ProjectReference Include="..\..\src\TestFramework\MSTest.Core\MSTest.Core.csproj">
43+
<ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj">
4344
<Project>{7252d9e3-267d-442c-96bc-c73aef3241d6}</Project>
4445
<Name>MSTest.Core</Name>
4546
</ProjectReference>

‎scripts/Build.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,15 +310,15 @@ function Replace-InFile($File, $RegEx, $ReplaceWith) {
310310
}
311311

312312
function Sync-PackageVersions {
313-
$versionsRegex = '(?mi)<(TestPlatformVersion.*?)>(.*?)<\/TestPlatformVersion>'
313+
$versionsRegex = '(?mi)<(MicrosoftNETTestSdkVersion.*?)>(.*?)<\/MicrosoftNETTestSdkVersion>'
314314
$packageRegex = '(?mi)<package id="Microsoft\.TestPlatform([0-9a-z.]+)?" version="([0-9a-z.-]*)"'
315315
$sourceRegex = '(?mi)(.+[a-z =]+\@?\")Microsoft\.TestPlatform\.([0-9.-a-z]+)\";'
316316

317317
if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) {
318-
$TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.TestPlatformVersion).InnerText
318+
$TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.MicrosoftNETTestSdkVersion).InnerText
319319
}
320320
else {
321-
Replace-InFile -File $TF_VERSIONS_FILE -RegEx $versionsRegex -ReplaceWith "<`$1>$TestPlatformVersion</TestPlatformVersion>"
321+
Replace-InFile -File $TF_VERSIONS_FILE -RegEx $versionsRegex -ReplaceWith "<`$1>$TestPlatformVersion</MicrosoftNETTestSdkVersion>"
322322
}
323323

324324
(Get-ChildItem "$PSScriptRoot\..\src\*packages.config", "$PSScriptRoot\..\test\*packages.config" -Recurse) | ForEach-Object {

‎scripts/build/TestFx.Loc.targets‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@
4242
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
4343
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
4444
</CreateItem>
45-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
46-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
45+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(LocResourceFile.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf" />
46+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe update -Resx %(ResxResources.Identity) -Xlf $(SharedResourceDirectory)\xlf\%(ResxResources.Filename).xlf" />
4747
</Target>
4848

4949
<!-- Generate language specific resx files from the xlf files -->
5050
<Target Name="CreateLocalizeResx" Condition="'$(IsLocalizedBuild)' == 'true'">
5151
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
5252
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
5353
</CreateItem>
54-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
54+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe writeTarget -Xlf $(ResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
5555
<ItemGroup>
5656
<EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
5757
</ItemGroup>
@@ -62,7 +62,7 @@
6262
<CreateItem Include="@(ResxResources)" AdditionalMetadata="Language=%(ResxLang.Identity)">
6363
<Output ItemName="LocResourceFile" TaskParameter="Include"/>
6464
</CreateItem>
65-
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool.0.1.3\tools\xlftool.exe writeTarget -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
65+
<Exec Command="$(TestFxPackagesRoot)fmdev.xlftool\0.1.3\tools\xlftool.exe writeTarget -Xlf $(SharedResourceDirectory)\xlf\%(LocResourceFile.Filename).%(LocResourceFile.Language).xlf -Resx $(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx -verbose" />
6666
<ItemGroup>
6767
<EmbeddedResource Include="$(ResourceDirectory)\%(LocResourceFile.Filename).%(LocResourceFile.Language).resx" />
6868
</ItemGroup>
@@ -71,7 +71,7 @@
7171
<!-- Localization for documentation files. -->
7272
<Target Name="CopyLocalizedXmls" BeforeTargets="BeforeBuild" Condition="$(LocDocumentationSubPath) != ''">
7373
<PropertyGroup>
74-
<_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
74+
<_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)</_SourcePath>
7575
</PropertyGroup>
7676
<ItemGroup>
7777
<_LocalizedFiles Include="$(_SourcePath)\**\*.*" />

‎scripts/build/TestFx.Settings.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props') and $(FrameworkIdentifier) != 'NetCore' and $(IncludeMicrosoftCommon) == 'true'" />
1010
<!-- Import props/targets with $(RepoRoot) since msbuild takes the relative path based on settings.targets and not with respect to the project. -->
11-
<Import Project="$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
1211
<Import Project="TestFx.Versions.targets" />
1312

1413
<PropertyGroup>

‎scripts/build/TestFx.Versions.targets‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TestPlatformVersion Condition=" '$(TestPlatformVersion)' == '' ">16.10.0-release-20210421-08</TestPlatformVersion>
4+
<MicrosoftNETTestSdkVersion Condition=" '$(MicrosoftNETTestSdkVersion)' == '' ">16.10.0-release-20210421-08</MicrosoftNETTestSdkVersion>
5+
6+
<!-- Toolset: keep in sync with ~/scripts/toolset/packages.config -->
7+
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
8+
<NuGetFrameworksVersion>5.0.0</NuGetFrameworksVersion>
9+
<!-- / Toolset: keep in sync with ~/scripts/toolset/packages.config -->
10+
11+
<!-- Try to keep all these in sync -->
12+
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>
13+
<SystemRuntimeSerializationJsonVersion>4.3.0</SystemRuntimeSerializationJsonVersion>
14+
<SystemRuntimeSerializationPrimitivesVersion>4.3.0</SystemRuntimeSerializationPrimitivesVersion>
15+
<SystemComponentModelEventBasedAsyncVersion>4.3.0</SystemComponentModelEventBasedAsyncVersion>
16+
<SystemComponentModelTypeConverterVersion>4.3.0</SystemComponentModelTypeConverterVersion>
17+
<SystemDiagnosticsTextWriterTraceListenerVersion>4.3.0</SystemDiagnosticsTextWriterTraceListenerVersion>
18+
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
19+
<SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>
20+
<!-- / Try to keep all these in sync -->
21+
22+
<SystemCollectionsImmutableVersion>1.6.0</SystemCollectionsImmutableVersion>
23+
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
24+
25+
<!-- UWP and WinUI dependencies -->
26+
<MicrosoftNETCoreUniversalWindowsPlatformVersion>5.3.0</MicrosoftNETCoreUniversalWindowsPlatformVersion>
27+
<MicrosoftProjectReunionVersion>0.5.0</MicrosoftProjectReunionVersion>
28+
<!-- / UWP and WinUI dependencies -->
29+
30+
<MoqVersion>4.8.2</MoqVersion>
31+
<CastleCoreVersion>4.2.1</CastleCoreVersion>
32+
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
33+
<StyleCopAnalyzersVersion>1.0.0</StyleCopAnalyzersVersion>
34+
35+
<!-- These are used to test compability with legacy MSTest, please do not update -->
36+
<Legacy__MicrosoftNETTestSdkVersion>15.7.0</Legacy__MicrosoftNETTestSdkVersion>
37+
<Legacy__MSTestTestAdapterVersion>1.2.0</Legacy__MSTestTestAdapterVersion>
38+
<Legacy__MSTestTestFrameworkVersion>1.2.0</Legacy__MSTestTestFrameworkVersion>
39+
<!-- / These are used to test compability with legacy MSTest, please do not update -->
40+
541
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
642
</PropertyGroup>
743
</Project>

‎scripts/build/TestFx.targets‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
<IsLocalizationEnabled Condition="'$(UpdateXlf)' == 'true' or '$(IsLocalizedBuild)' == 'true'">true</IsLocalizationEnabled>
1212
</PropertyGroup>
1313

14-
<!-- Import props/targets with $(RepoRoot) since msbuild takes the relative path based on settings.targets and not with respect to the project. -->
15-
<Import Project="$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(RepoRoot)packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
16-
1714
<!-- Import localization specific Targets if enabled. -->
1815
<Import Project="$(MSBuildThisFileDirectory)TestFx.Loc.targets" Condition="($(IsTest) == '' or $(IsTest) == 'false') and $(IsLocalizationEnabled) == 'true'"/>
1916

@@ -30,9 +27,9 @@
3027
<Link>stylecop.json</Link>
3128
</AdditionalFiles>
3229

33-
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
34-
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
35-
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
30+
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
31+
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
32+
<Analyzer Include="$(TestFxPackagesRoot)StyleCop.Analyzers\$(StyleCopAnalyzersVersion)\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
3633
</ItemGroup>
3734

3835
<!-- Signing and Localization. -->
@@ -48,14 +45,6 @@
4845
</SignFilesDependsOn>
4946
</ItemGroup>
5047

51-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
52-
<PropertyGroup>
53-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
54-
</PropertyGroup>
55-
<Error Condition="!Exists('$(TestFxPackagesRoot)MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(TestFxPackagesRoot)MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
56-
<Error Condition="!Exists('$(TestFxPackagesRoot)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(TestFxPackagesRoot)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
57-
</Target>
58-
5948
<Target Name="GatherLocalizedOutputsForSigning" DependsOnTargets="TestFxLocalization">
6049
<ItemGroup>
6150
<FilesToSign Include="$(OutDir)\**\$(AssemblyName).resources.dll">

‎scripts/common.lib.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $env:TF_PACKAGES_DIR = Join-Path $env:TF_ROOT_DIR "packages"
2222

2323
$TF_VERSIONS_FILE = "$PSScriptRoot\build\TestFx.Versions.targets"
2424
if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) {
25-
$TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.TestPlatformVersion).InnerText
25+
$TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.MicrosoftNETTestSdkVersion).InnerText
2626
}
2727

2828
function Create-Directory([string[]] $path) {

‎scripts/test.ps1‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,13 @@ function Run-Test([string[]] $testContainers, [string[]] $netCoreTestContainers)
194194
function Get-VSTestPath
195195
{
196196
$versionsFile = "$PSScriptRoot\build\TestFx.Versions.targets"
197-
$TestPlatformVersion = (([XML](Get-Content $versionsFile)).Project.PropertyGroup.TestPlatformVersion).InnerText
197+
$TestPlatformVersion = (([XML](Get-Content $versionsFile)).Project.PropertyGroup.MicrosoftNETTestSdkVersion).InnerText
198198

199199
$vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform.$TestPlatformVersion\"
200+
if(-not (Test-Path $vsInstallPath)) {
201+
$vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform\$TestPlatformVersion\"
202+
}
203+
200204
$vstestPath = Join-Path -path $vsInstallPath "tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe"
201205
return Resolve-Path -path $vstestPath
202206
}

‎src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,46 @@
2929
<ErrorReport>prompt</ErrorReport>
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
32+
33+
<ItemGroup>
34+
<Reference Include="System.Collections.Concurrent">
35+
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll</HintPath>
36+
</Reference>
37+
38+
<ProjectReference Include="$(TestFxRoot)src\Adapter\PlatformServices.Interface\PlatformServices.Interface.csproj">
39+
<Project>{bbc99a6b-4490-49dd-9c12-af2c1e95576e}</Project>
40+
<Name>PlatformServices.Interface</Name>
41+
<Private>False</Private>
42+
</ProjectReference>
43+
<ProjectReference Include="$(TestFxRoot)src\Adapter\PlatformServices.Portable\PlatformServices.Portable.csproj">
44+
<Project>{58bdd63d-5e58-4d23-bdf5-592e5e03d29d}</Project>
45+
<Name>PlatformServices.Portable</Name>
46+
<Private>False</Private>
47+
</ProjectReference>
48+
<ProjectReference Include="$(TestFxRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj">
49+
<Project>{7252d9e3-267d-442c-96bc-c73aef3241d6}</Project>
50+
<Name>MSTest.Core</Name>
51+
<Private>False</Private>
52+
</ProjectReference>
53+
<ProjectReference Include="$(TestFxRoot)src\TestFramework\Extension.Core\Extension.Core.csproj">
54+
<Project>{6c9fe494-8315-4667-b3f6-75dc62a62319}</Project>
55+
<Name>Extension.Core</Name>
56+
<Private>False</Private>
57+
</ProjectReference>
58+
</ItemGroup>
59+
60+
<ItemGroup>
61+
<PackageReference Include="Microsoft.TestPlatform.AdapterUtilities" Version="$(MicrosoftNETTestSdkVersion)" />
62+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
63+
64+
<PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)" PrivateAssets="all">
65+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66+
</PackageReference>
67+
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all">
68+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
69+
</PackageReference>
70+
</ItemGroup>
71+
3272
<ItemGroup>
3373
<Compile Include="Discovery\AssemblyEnumerator.cs" />
3474
<Compile Include="Discovery\AssemblyEnumeratorWrapper.cs" />
@@ -90,54 +130,16 @@
90130
<DependentUpon>Resource.resx</DependentUpon>
91131
</Compile>
92132
<Compile Include="RunConfigurationSettings.cs" />
93-
</ItemGroup>
94-
<ItemGroup>
95-
<ProjectReference Include="..\..\TestFramework\Extension.Core\Extension.Core.csproj">
96-
<Project>{6c9fe494-8315-4667-b3f6-75dc62a62319}</Project>
97-
<Name>Extension.Core</Name>
98-
<Private>False</Private>
99-
</ProjectReference>
100-
<ProjectReference Include="..\..\TestFramework\MSTest.Core\MSTest.Core.csproj">
101-
<Project>{7252d9e3-267d-442c-96bc-c73aef3241d6}</Project>
102-
<Name>MSTest.Core</Name>
103-
<Private>False</Private>
104-
</ProjectReference>
105-
<ProjectReference Include="..\PlatformServices.Interface\PlatformServices.Interface.csproj">
106-
<Project>{bbc99a6b-4490-49dd-9c12-af2c1e95576e}</Project>
107-
<Name>PlatformServices.Interface</Name>
108-
<Private>False</Private>
109-
</ProjectReference>
110-
<ProjectReference Include="..\PlatformServices.Portable\PlatformServices.Portable.csproj">
111-
<Project>{58bdd63d-5e58-4d23-bdf5-592e5e03d29d}</Project>
112-
<Name>PlatformServices.Portable</Name>
113-
<Private>False</Private>
114-
</ProjectReference>
115-
</ItemGroup>
116-
<ItemGroup>
133+
117134
<None Include="app.config" />
118135
</ItemGroup>
119-
<ItemGroup>
120-
<Reference Include="System.Collections.Concurrent">
121-
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll</HintPath>
122-
</Reference>
123-
</ItemGroup>
124136
<ItemGroup>
125137
<EmbeddedResource Include="Resources\Resource.resx">
126138
<Generator>ResXFileCodeGenerator</Generator>
127139
<LastGenOutput>Resource.Designer.cs</LastGenOutput>
128140
<CustomToolNamespace>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter</CustomToolNamespace>
129141
</EmbeddedResource>
130142
</ItemGroup>
131-
<ItemGroup>
132-
<PackageReference Include="Microsoft.TestPlatform.AdapterUtilities" Version="$(TestPlatformVersion)" />
133-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(TestPlatformVersion)" />
134-
<PackageReference Include="MicroBuild.Core" Version="0.2.0" PrivateAssets="all">
135-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
136-
</PackageReference>
137-
<PackageReference Include="StyleCop.Analyzers" Version="1.0.0" PrivateAssets="all">
138-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
139-
</PackageReference>
140-
</ItemGroup>
141143
<Import Project="$(TestFxRoot)scripts\build\TestFx.targets" />
142144
<PropertyGroup>
143145
<SourcePath>$(ProjectDir)..\Build</SourcePath>

0 commit comments

Comments
 (0)