Skip to content

Commit

Permalink
Cleaning the remaining set of dependencies for source build. (#2058)
Browse files Browse the repository at this point in the history
* Cleaning the remaining set of dependencies for source build.
a. Microsoft.Build.Framework and Microsoft.Build.Utilities.Core to source built version: 16.0.461
b. Microsoft.Extensions.DependencyModel to source built version: 3.0.0-preview4-27615-11
c. Removed the redundant reference to Microsoft.Internal.Dia.Interop
d. Adding check for source build for StyleCop.Analyzers

* Fixing the failures
* Adding System.Memory and System.Runtime.CompilerServices.Unsafe to portable package
* Correcting the number of files.
* Made the packages configurable via the props file.
* Fixing versions in the unit test project as well.
* Removing redundant dependency in the testhost nuspec
  • Loading branch information
singhsarab authored Jun 21, 2019
1 parent 200b66d commit fb3545c
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 33 deletions.
7 changes: 7 additions & 0 deletions scripts/build/TestPlatform.Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,12 @@
<MoqVersion>4.7.63</MoqVersion>
<TestPlatformExternalsVersion>16.0.0-preview-2148743</TestPlatformExternalsVersion>

<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview4-27615-11</MicrosoftExtensionsDependencyModelPackageVersion>
</PropertyGroup>

<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

</Project>
2 changes: 1 addition & 1 deletion scripts/build/TestPlatform.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<!-- Static analysis dependencies -->
<ItemGroup Condition="$(EnableCodeAnalysis) == 'true'">
<ItemGroup Condition="$(EnableCodeAnalysis) == 'true' AND '$(DotNetBuildFromSource)' != 'true'" >
<PackageReference Include="StyleCop.Analyzers">
<Version>1.0.1</Version>
<PrivateAssets>All</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions scripts/verify-nupkgs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ function Verify-Nuget-Packages($packageDirectory)
Write-Log "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{"Microsoft.CodeCoverage" = 29;
"Microsoft.NET.Test.Sdk" = 13;
"Microsoft.TestPlatform" = 422;
"Microsoft.TestPlatform" = 421;
"Microsoft.TestPlatform.Build" = 19;
"Microsoft.TestPlatform.CLI" = 302;
"Microsoft.TestPlatform.CLI" = 303;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
"Microsoft.TestPlatform.ObjectModel" = 65;
"Microsoft.TestPlatform.Portable" = 472;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
</PropertyGroup>
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
<AssemblyName>Microsoft.TestPlatform.Build</AssemblyName>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<WarningsAsErrors>true</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
Expand All @@ -31,12 +32,8 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework">
<Version>15.1.548</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>15.1.548</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
</ItemGroup>
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
Expand All @@ -7,7 +7,7 @@
<PropertyGroup>
<AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
<TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0;net451</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0</TargetFrameworks>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<EnableCodeAnalysis>true</EnableCodeAnalysis>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
<EmbeddedResource Include="Resources\Resources.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel">
<Version>1.0.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Diagnostics.Process">
Expand Down
8 changes: 4 additions & 4 deletions src/package/external/external.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@
<Version>15.6.815-master284DF69C</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<!-- Required for resolution of desktop dependencies in non windows environment.
<!-- Required for resolution of desktop dependencies in non windows environment.
We've to set to net46 since the net451 and other packages have assemblies in wrong case.
E.g. System.XML instead of System.Xml. -->
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.6">
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.6">
<Version>1.0.1</Version>
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<!-- net451 -->
<file src="net451\$Runtime$\datacollector.exe" target="tools\net451\datacollector.exe" />
<file src="net451\$Runtime$\datacollector.exe.config" target="tools\net451\datacollector.exe.config" />
<file src="net451\$Runtime$\Microsoft.DotNet.PlatformAbstractions.dll" target="tools\net451\Microsoft.DotNet.PlatformAbstractions.dll" />
<file src="net451\$Runtime$\Microsoft.Extensions.DependencyModel.dll" target="tools\net451\Microsoft.Extensions.DependencyModel.dll" />
<file src="net451\$Runtime$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net451\Microsoft.TestPlatform.CommunicationUtilities.dll" />
<file src="net451\$Runtime$\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\net451\Microsoft.TestPlatform.CoreUtilities.dll" />
Expand Down Expand Up @@ -223,8 +222,9 @@
<file src="netcoreapp2.0\datacollector.dll" target="tools\netcoreapp2.0\datacollector.dll" />
<file src="netcoreapp2.0\datacollector.dll.config" target="tools\netcoreapp2.0\datacollector.dll.config" />
<file src="netcoreapp2.0\datacollector.runtimeconfig.json" target="tools\netcoreapp2.0\datacollector.runtimeconfig.json" />
<file src="netcoreapp2.0\Microsoft.DotNet.PlatformAbstractions.dll" target="tools\netcoreapp2.0\Microsoft.DotNet.PlatformAbstractions.dll" />
<file src="netcoreapp2.0\Microsoft.Extensions.DependencyModel.dll" target="tools\netcoreapp2.0\Microsoft.Extensions.DependencyModel.dll" />
<file src="netcoreapp2.0\System.Memory.dll" target="tools\netcoreapp2.0\System.Memory.dll" />
<file src="netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.dll" target="tools\netcoreapp2.0\System.Runtime.CompilerServices.Unsafe.dll" />
<file src="netcoreapp2.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\netcoreapp2.0\Microsoft.TestPlatform.CommunicationUtilities.dll" />
<file src="netcoreapp2.0\Microsoft.TestPlatform.CoreUtilities.dll" target="tools\netcoreapp2.0\Microsoft.TestPlatform.CoreUtilities.dll" />
<file src="netcoreapp2.0\Microsoft.TestPlatform.CrossPlatEngine.dll" target="tools\netcoreapp2.0\Microsoft.TestPlatform.CrossPlatEngine.dll" />
Expand Down
1 change: 0 additions & 1 deletion src/package/nuspec/Microsoft.TestPlatform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
<file src="net451\$Runtime$\LegacyTypes.testtype" target="tools\net451\Common7\IDE\Extensions\TestPlatform\LegacyTypes.testtype" />
<file src="net451\$Runtime$\ManualTests.testtype" target="tools\net451\Common7\IDE\Extensions\TestPlatform\ManualTests.testtype" />
<file src="net451\$Runtime$\Microsoft.DiaSymReader.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.DiaSymReader.dll" />
<file src="net451\$Runtime$\Microsoft.DotNet.PlatformAbstractions.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.DotNet.PlatformAbstractions.dll" />
<file src="net451\$Runtime$\Microsoft.Extensions.DependencyModel.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.Extensions.DependencyModel.dll" />
<file src="net451\$Runtime$\Microsoft.IntelliTrace.Core.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.IntelliTrace.Core.dll" />
<file src="net451\$Runtime$\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net451\Common7\IDE\Extensions\TestPlatform\Microsoft.TestPlatform.CommunicationUtilities.dll" />
Expand Down
6 changes: 3 additions & 3 deletions src/package/nuspec/TestPlatform.Build.nuspec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<package >
<metadata>
<id>Microsoft.TestPlatform.Build</id>
Expand All @@ -15,10 +15,10 @@
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
</metadata>
<files>
<file src="Microsoft.TestPlatform.Build\netstandard1.3\Microsoft.TestPlatform.targets" target="runtimes\any\native" />
<file src="Microsoft.TestPlatform.Build\netstandard2.0\Microsoft.TestPlatform.targets" target="runtimes\any\native" />

<!-- Add localized resources -->
<file src="Microsoft.TestPlatform.Build\netstandard1.3\**\*.dll" target="lib\netstandard1.3" />
<file src="Microsoft.TestPlatform.Build\netstandard2.0\**\*.dll" target="lib\netstandard2.0" />

</files>
</package>
1 change: 0 additions & 1 deletion src/package/nuspec/TestPlatform.TestHost.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Microsoft.Extensions.DependencyModel" version="1.0.3"/>
</group>

<group targetFramework="uap10.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<AssemblyName>Microsoft.TestPlatform.Build.UnitTests</AssemblyName>
<WarningsAsErrors>true</WarningsAsErrors>
<EnableCodeAnalysis>true</EnableCodeAnalysis>
Expand All @@ -18,12 +18,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework">
<Version>15.1.548</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>15.1.548</Version>
</PackageReference>
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
</ItemGroup>
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
</Project>

0 comments on commit fb3545c

Please sign in to comment.