Add Package and Deploy of Dotnet Tool, Update Licenses (#124)

* Updates for global tool gen, Update License * Update devskim-core.yml for Azure Pipelines Add packaging and deployment of devskim dotnet tool * Update Package Descriptions * Update DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj * Update DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj Co-authored-by: Gabe Stocco <gabe@gstocco.com>
2020-02-28 09:48:18 -08:00 · 2020-02-28 09:48:18 -08:00 · 65575ce27e
--- a/DevSkim-DotNet/Content/LICENSE.txt
+++ b/DevSkim-DotNet/Content/LICENSE.txt
@ -0,0 +1,21 @@
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+MIT License
+
+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.
--- a/DevSkim-DotNet/Content/devskim-icon-128.png
+++ b/DevSkim-DotNet/Content/devskim-icon-128.png
--- a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj
+++ b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj
@ -6,14 +6,20 @@
    <AssemblyName>devskim</AssemblyName>
    <StartupObject>Microsoft.DevSkim.CLI.Program</StartupObject>
    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <ApplicationIcon />
-    <PackageId>Microsoft.DevSkim.CLI</PackageId>
+    <PackageId>DevSkim</PackageId>
    <Product>Microsoft DevSkim Command Line Interface</Product>
-    <Version>0.1.11</Version>
+    <Version>0.0.0</Version>
    <Authors>Microsoft</Authors>
    <Company>Microsoft</Company>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright> 
-    <Description>DevSkim is a framework and Language analyzer that provide inline security analysis</Description>    
+    <Description>DevSkim is a framework and language analyzer that provides inline security analysis. This is a Dotnet Tool package. For the library package, see Microsoft.DevSkim.</Description>
+    <PackAsTool>true</PackAsTool>
+    <ToolCommandName>devskim</ToolCommandName>
+    <PackageTags>Security Linter</PackageTags>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageIcon>devskim-icon-128.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/Microsoft/DevSkim</PackageProjectUrl>
+    <PackageVersion>0.0.0</PackageVersion>
  </PropertyGroup>

  <ItemGroup>
@ -29,4 +35,8 @@
    <ProjectReference Include="..\Microsoft.DevSkim\Microsoft.DevSkim.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <None Include="..\Content\LICENSE.txt" Pack="true" PackagePath=""/>
+    <None Include="..\Content\devskim-icon-128.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
 </Project>
--- a/DevSkim-DotNet/Microsoft.DevSkim.VSExtension/Content/License.txt
+++ b/DevSkim-DotNet/Microsoft.DevSkim.VSExtension/Content/License.txt
@ -1,17 +1,21 @@
-Copyright (c) 2016 Microsoft Corporation
-
-All rights reserved.
+Copyright (c) Microsoft Corporation. All rights reserved.

 MIT License

-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:
+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 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.
+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.
--- a/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj
+++ b/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj
@ -3,18 +3,16 @@
  <PropertyGroup>
    <TargetFrameworks>netcoreapp3.1;net48;</TargetFrameworks>    
    <PackageId>Microsoft.DevSkim</PackageId>
-    <PackageVersion>0.3.8</PackageVersion>
+    <PackageVersion>0.0.0</PackageVersion>
    <Authors>Microsoft</Authors>
    <PackageTags>Security Linter</PackageTags>
    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <PackageLicenseUrl>https://github.com/Microsoft/DevSkim/blob/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright> 
-    <Description>DevSkim is a framework and Language analyzer that provide inline security analysis</Description>
-    <PackageIconUrl>https://raw.githubusercontent.com/Microsoft/DevSkim/master/media/64x64.png</PackageIconUrl>
+    <Description>DevSkim is a framework and language analyzer that provides inline security analysis.</Description>
+    <PackageIcon>devskim-icon-128.png</PackageIcon>
    <PackageProjectUrl>https://github.com/Microsoft/DevSkim</PackageProjectUrl>
-    <RepositoryUrl></RepositoryUrl>
  </PropertyGroup>
-
  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
  </ItemGroup>
@ -25,13 +23,18 @@
  </ItemGroup>

  <ItemGroup>
-    <EmbeddedResource Include="Resources\comments.json" />
    <EmbeddedResource Include="Resources\devskim-rules.json" />
+    <EmbeddedResource Include="Resources\comments.json" />
    <EmbeddedResource Include="Resources\languages.json" />
  </ItemGroup>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+  
+  <ItemGroup>
+    <None Include="..\Content\LICENSE.txt" Pack="true" PackagePath=""/>
+    <None Include="..\Content\devskim-icon-128.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
+  
+  <Target Name="PreBuild" BeforeTargets="BeforeCompile">
    <Exec Command="dotnet ../../RulePacker/devskim.dll pack ../../rules Resources/devskim-rules.json" />
  </Target>
-
+  
 </Project>
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,17 +1,21 @@
-Copyright (c) 2016 Microsoft Corporation
-
-All rights reserved.
+Copyright (c) Microsoft Corporation. All rights reserved.

 MIT License

-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:
+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 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.
+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.
--- a/Pipelines/devskim-core.yml
+++ b/Pipelines/devskim-core.yml
@ -120,12 +120,19 @@ stages:
        publishWebProjects: false
        zipAfterPublish: false
    - task: DotNetCoreCLI@2
-      displayName: Pack Nupkg
+      displayName: Pack Nupkg (Lib)
      inputs:
        command: 'custom'
        custom: 'pack'
        arguments: 'Microsoft.DevSkim -c Release -o $(Build.BinariesDirectory)\nuget\DevSkim_$(ReleaseVersion)'
        workingDirectory: '$(SolutionDirectory)'
+    - task: DotNetCoreCLI@2
+      displayName: Pack Nupkg (Dotnet Tool)
+      inputs:
+        command: 'custom'
+        custom: 'pack'
+        arguments: 'Microsoft.DevSkim.CLI -c Release -o $(Build.BinariesDirectory)\nuget\DevSkim_$(ReleaseVersion)'
+        workingDirectory: '$(SolutionDirectory)'
    - task: AntiMalware@3
      displayName: Anti-Malware Scan
      inputs:
@ -360,7 +367,7 @@ stages:
        MaxConcurrency: '50'
        MaxRetryAttempts: '5'
    - task: EsrpCodeSigning@1
-      displayName: Code Sign Nuget Package
+      displayName: Code Sign Nuget Packages
      inputs:
        ConnectedServiceName: 'Devskim_CodeSign'
        FolderPath: '$(Build.BinariesDirectory)/nuget/DevSkim_$(ReleaseVersion)'
@ -431,7 +438,7 @@ stages:
            Add-Content $(Build.StagingDirectory)\HASHES.txt "$tmp`t$name"
          }
    - task: PowerShell@2
-      displayName: Move Nuget Package
+      displayName: Move Nuget Packages
      inputs:
        targetType: 'inline'
        script: 'mv $env:BUILD_BINARIESDIRECTORY/nuget/DevSkim_$(ReleaseVersion)/*.nupkg $env:BUILD_STAGINGDIRECTORY/'
@ -459,5 +466,5 @@ stages:
        command: 'push'
        packagesToPush: '$(Build.StagingDirectory)/*.nupkg'
        nuGetFeedType: 'external'
-        publishFeedCredentials: 'DevSkim Nuget CI'
+        publishFeedCredentials: 'CST-E Nuget CI'
        verbosityPush: 'Normal'