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.

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

Added thirt party notice to nuget packages using third party package #249

Merged
merged 4 commits into from
Nov 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 2 deletions scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,9 @@ function Create-NugetPackages
Copy-Item $tpSrcDir\$file $stagingDir -Force
}

# Copy over empty file
Copy-Item -Recurse $tpSrcDir\package\"_._" $stagingDir -Force
# Copy over empty and third patry notice file
Copy-Item $tpSrcDir\package\"_._" $stagingDir -Force
Copy-Item $tpSrcDir\package\"ThirdPartyNotices.txt" $stagingDir -Force

# 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"
Expand Down
7 changes: 5 additions & 2 deletions src/Microsoft.NET.Test.Sdk.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
<title>Microsoft.NET.Test.Sdk</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<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>
<copyright>Copyright 2015</copyright>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<dependencies>
<dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion src/TestPlatform.Build.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<description>Build tasks and targets for running tests with Test Platform</description>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>Copyright � Microsoft Corporation</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="Microsoft.TestPlatform.Build\netstandard1.3\Microsoft.TestPlatform.Build.dll" target="lib\netstandard1.3\" />
Expand Down
6 changes: 5 additions & 1 deletion src/TestPlatform.CLI.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@
<description>The cross platform Microsoft Test Platform.</description>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<contentFiles>
<files include="**/*.*" copyToOutput="true" flatten="false" buildAction="None" />
</contentFiles>
</metadata>
<files>
<!-- Add a thirt party notice file -->
<file src="ThirdPartyNotices.txt" target="" />

<file src="netcoreapp1.0\**\*.*" target="contentFiles\any\any\" />
</files>
</package>
3 changes: 2 additions & 1 deletion src/TestPlatform.ObjectModel.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<description>The Microsoft Test Platform Object Model.</description>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="net46">
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
Expand Down
5 changes: 4 additions & 1 deletion src/TestPlatform.TestHost.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<description>Testplatform host executes the test using specified adapter.</description>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm</licenseUrl>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://github.com/microsoft/vstest/</projectUrl>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.TestPlatform.ObjectModel" version="$Version$"/>
Expand All @@ -21,6 +22,8 @@
</dependencies>
</metadata>
<files>
<!-- Add a thirt party notice file -->
<file src="ThirdPartyNotices.txt" target="" />
<file src="_._" target="lib\net45\" />

<file src="Microsoft.TestPlatform.TestHost\netcoreapp1.0\Microsoft.TestPlatform.CommunicationUtilities.dll" target="lib\netstandard1.5\" />
Expand Down
35 changes: 35 additions & 0 deletions src/package/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
VSTest

THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
Do Not Translate or Localize

This software incorporates components from the projects listed below. The original copyright notices
and the licenses under which Microsoft received such components are set forth below and are provided for
informational purposes only. Microsoft reserves all rights not expressly granted herein, whether by
implication, estoppel or otherwise.

1. Newtonsoft version 8.0.3 and 9.0.1 (https://github.com/JamesNK/Newtonsoft.Json)



%% Newtonsoft NOTICES AND INFORMATION BEGIN HERE
=========================================
The MIT License (MIT)

Copyright (c) 2007 James Newton-King
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=========================================
END OF Newtonsoft NOTICES AND INFORMATION