Added thirt party notice to nuget packages using third party package (#…

…249) * Added thirt party notice to nuget packages
microsoft · Nov 25, 2016 · 39eeb32 · 39eeb32
1 parent 2ba39cd
commit 39eeb32
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 8 deletions.
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -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"

diff --git a/src/Microsoft.NET.Test.Sdk.nuspec b/src/Microsoft.NET.Test.Sdk.nuspec
@@ -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>

diff --git a/src/TestPlatform.Build.nuspec b/src/TestPlatform.Build.nuspec
@@ -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\" />

diff --git a/src/TestPlatform.CLI.nuspec b/src/TestPlatform.CLI.nuspec
@@ -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>
diff --git a/src/TestPlatform.ObjectModel.nuspec b/src/TestPlatform.ObjectModel.nuspec
@@ -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, )" />

diff --git a/src/TestPlatform.TestHost.nuspec b/src/TestPlatform.TestHost.nuspec
@@ -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$"/>
@@ -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\" />

diff --git a/src/package/ThirdPartyNotices.txt b/src/package/ThirdPartyNotices.txt
@@ -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