Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add UWP testhost deps in meta package #1351

Merged
merged 6 commits into from
Jan 3, 2018
Merged

Add UWP testhost deps in meta package #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0300647
Add UWP testhost deps in meta package
smadala Dec 29, 2017
f84feae
Add dependecies as min versions
smadala Jan 2, 2018
503775a
Make Netwonsoft json version as variable
smadala Jan 2, 2018
bc52e0e
nit fix
smadala Jan 2, 2018
5aee3e8
Use JsonNetVersion in translationlayer.nuspec
smadala Jan 2, 2018
20cd2ed
Merge branch 'master' into uwp-meta-pkg
smadala Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,9 @@ function Create-NugetPackages
# Call nuget pack on these components.
$nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe"

# Pass Newtonsoft.Json version to nuget pack to keep the version consistent across all nuget packages.
$JsonNetVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.JsonNetVersion

# package them from stagingDir
foreach ($file in $nuspecFiles) {
$additionalArgs = ""
Expand All @@ -533,7 +536,7 @@ function Create-NugetPackages
}

Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version $additionalArgs"
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20 $additionalArgs
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20 $additionalArgs
}

Write-Log "Create-NugetPackages: Complete. {$(Get-ElapsedTime($timer))}"
Expand Down
21 changes: 18 additions & 3 deletions src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,27 @@
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<description>The MSbuild targets and properties for building the .Net core test projects.</description>
<description>The MSbuild targets and properties for building .NET test projects.</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<dependencies>
<dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
<dependency id="Microsoft.CodeCoverage" version="1.0.3" />
<group targetFramework="uap10.0">
<dependency id="System.ComponentModel.Primitives" version="[4.1.0, )" />
<dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
<dependency id="Newtonsoft.Json" version="[$JsonNetVersion$, )" />
<!-- TestHost gets shipped as ExtensionSDKs with name TestPlatform.Universal. -->
<!-- Currently code coverage not supported for uap10.0. -->
</group>
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
<dependency id="Microsoft.CodeCoverage" version="1.0.3" />
</group>
<group targetFramework="net45">
<!-- TestHost gets shipped with vstest.console -->
<dependency id="Microsoft.CodeCoverage" version="1.0.3" />
</group>
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft</tags>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
</metadata>
<files>
<!-- Add a third party notice file -->
Expand Down
2 changes: 1 addition & 1 deletion src/package/nuspec/Microsoft.TestPlatform.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft</tags>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
</metadata>
<files>
<!-- Add a third party notice file -->
Expand Down
1 change: 1 addition & 0 deletions src/package/nuspec/TestPlatform.Build.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<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" />
Expand Down
1 change: 1 addition & 0 deletions src/package/nuspec/TestPlatform.CLI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<contentFiles>
<files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
</contentFiles>
Expand Down
1 change: 1 addition & 0 deletions src/package/nuspec/TestPlatform.ObjectModel.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<dependencies>
<group targetFramework="net451">
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.3.0, )" />
Expand Down
7 changes: 3 additions & 4 deletions src/package/nuspec/TestPlatform.TestHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<dependencies>
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>

<!-- CommunicationUtilities requires 8.0.3, but 8.0.3 doesn't provide a netcoreapp1.0 target -->
<dependency id="Newtonsoft.Json" version="9.0.1"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Microsoft.Extensions.DependencyModel" version="1.0.3"/>
</group>

<group targetFramework="uap10.0">
<dependency id="Newtonsoft.Json" version="9.0.1"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
<dependency id="System.Xml.ReaderWriter" version="4.0.11" />
</group>
Expand Down
5 changes: 3 additions & 2 deletions src/package/nuspec/TestPlatform.TranslationLayer.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<dependencies>
<group targetFramework="net451">
<dependency id="Newtonsoft.Json" version="9.0.1"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
</group>
<group targetFramework="netstandard1.5">
Expand All @@ -29,7 +30,7 @@
<!-- TestPlatform.Common dependencies -->
<dependency id="System.Runtime.Loader" version="[4.0.0, )" />
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
<dependency id="Newtonsoft.Json" version="9.0.1"/>
<dependency id="Newtonsoft.Json" version="$JsonNetVersion$"/>
</group>
</dependencies>
<frameworkAssemblies>
Expand Down