updating TPN and adding TPN/EULA to Nuget/VSIX (#2836)

dotnet · Sep 10, 2019 · 55fec76 · 55fec76
1 parent 445391a
commit 55fec76
Show file tree

Hide file tree

Showing 14 changed files with 286 additions and 64 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,4 +1,16 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <!-- Add License and Third Party Notices files into each VSIX. -->
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)\assets\EULA.rtf">
+      <Link>EULA.rtf</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)\assets\ThirdPartyNotices.rtf">
+       <Link>ThirdPartyNotices.rtf</Link>
+       <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/THIRD-PARTY-NOTICES.txt b/THIRD-PARTY-NOTICES.txt
@@ -26,23 +26,6 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
-License notice for Humanizer
--------------------------------------
-
-https://github.com/Humanizr/Humanizer
-
-Copyright (c) 2018 .NET Foundation and Contributors
-
-This software is licensed subject to the MIT license, available at 
-https://opensource.org/licenses/MIT
-
-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.
-
-
 License notice for Roslyn Clr Heap Allocation Analyzer
 -------------------------------------
 

diff --git a/assets/ThirdPartyNotices.rtf b/assets/ThirdPartyNotices.rtf
diff --git a/eng/GenerateAnalyzerNuspec.csx b/eng/GenerateAnalyzerNuspec.csx
@@ -225,6 +225,7 @@ if (legacyRulesets.Length > 0)
     }
 }
 
+result.AppendLine(FileElement(Path.Combine(assetsDir, "EULA.rtf"), ""));
 result.AppendLine(FileElement(Path.Combine(assetsDir, "ThirdPartyNotices.rtf"), ""));
 result.AppendLine(@"  </files>");
 

diff --git a/src/MetaCompilation.Analyzers/Setup/source.extension.vsixmanifest b/src/MetaCompilation.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="5c6391a0-1c50-455e-af26-4625f610bc62" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft"/>
     <DisplayName>MetaCompilation Analyzers</DisplayName>
     <Description xml:space="preserve">This is a sample diagnostic extension for the .NET Compiler Platform ("Roslyn").</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Setup/source.extension.vsixmanifest b/src/Microsoft.CodeAnalysis.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="41880BF7-B087-402F-AE29-18A367E9DF9B" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>.NET Compiler Platform (Roslyn) Analyzers</DisplayName>
     <Description xml:space="preserve">Analyzers for .NET Compiler Platform (Roslyn) APIs.</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Setup/source.extension.vsixmanifest b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="7ba185fb-b7f2-4015-bc49-576b2266193e" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Banned API Analyzers</DisplayName>
     <Description xml:space="preserve">Banned API Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Microsoft.CodeQuality.Analyzers/Setup/source.extension.vsixmanifest b/src/Microsoft.CodeQuality.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="81f388f0-1777-4c56-be8f-51f5f420037d" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Microsoft.CodeQuality Analyzers</DisplayName>
     <Description xml:space="preserve">Microsoft.CodeQuality Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Microsoft.NetCore.Analyzers/Setup/source.extension.vsixmanifest b/src/Microsoft.NetCore.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="8e93bd53-8b59-4c05-ae8a-b8e16de6a5d6" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Microsoft.NetCore Analyzers</DisplayName>
     <Description xml:space="preserve">Analyzers for .NetCore APIs.</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Microsoft.NetFramework.Analyzers/Setup/source.extension.vsixmanifest b/src/Microsoft.NetFramework.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="bed80bcf-3952-4747-8c03-6770eeeb1595" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Microsoft.NetFramework Analyzers</DisplayName>
     <Description xml:space="preserve">Analyzers for APIs specific to the full .NetFramework which are not present in .NetCore</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/PerformanceSensitiveAnalyzers/Setup/source.extension.vsixmanifest b/src/PerformanceSensitiveAnalyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="20ad7bf0-adc1-4fb0-8089-3dec89e40855" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>PerformanceSensitive Analyzers</DisplayName>
     <Description xml:space="preserve">PerformanceSensitive Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/PublicApiAnalyzers/Setup/source.extension.vsixmanifest b/src/PublicApiAnalyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="631e3e9b-f3de-4df9-99ab-a92a9fe778a1" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Public API Analyzers</DisplayName>
     <Description xml:space="preserve">Public API Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Roslyn.Diagnostics.Analyzers/Setup/source.extension.vsixmanifest b/src/Roslyn.Diagnostics.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="574abf23-083a-46c6-9aab-9db558ce883a" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Roslyn.Diagnostics Analyzers</DisplayName>
     <Description xml:space="preserve">Roslyn.Diagnostics Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />

diff --git a/src/Text.Analyzers/Setup/source.extension.vsixmanifest b/src/Text.Analyzers/Setup/source.extension.vsixmanifest
@@ -5,6 +5,7 @@
     <Identity Id="65c816b1-04f9-4b1a-b767-078f8ccd627e" Version="|%CurrentProject%;GetVsixVersion|" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Text Analyzers</DisplayName>
     <Description xml:space="preserve">Text Analyzers</Description>
+    <License>EULA.rtf</License>
   </Metadata>
   <Installation>
     <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0.27130.0,]" />