Skip to content

Commit 65575ce

Browse files
daalcantgfs
daalcant
and
gfs
authoredFeb 28, 2020
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>
·
v1.0.52VS_v0.8.48-alpha
1 parent e0faf01 commit 65575ce

File tree

7 files changed

+91
-42
lines changed

7 files changed

+91
-42
lines changed
 

‎DevSkim-DotNet/Content/LICENSE.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright (c) Microsoft Corporation. All rights reserved.
2+
3+
MIT License
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎DevSkim-DotNet/Content/devskim-icon-128.png

1.58 KB
Loading

‎DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj

+14-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
<AssemblyName>devskim</AssemblyName>
77
<StartupObject>Microsoft.DevSkim.CLI.Program</StartupObject>
88
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
9-
<ApplicationIcon />
10-
<PackageId>Microsoft.DevSkim.CLI</PackageId>
9+
<PackageId>DevSkim</PackageId>
1110
<Product>Microsoft DevSkim Command Line Interface</Product>
12-
<Version>0.1.11</Version>
11+
<Version>0.0.0</Version>
1312
<Authors>Microsoft</Authors>
1413
<Company>Microsoft</Company>
1514
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
16-
<Description>DevSkim is a framework and Language analyzer that provide inline security analysis</Description>
15+
<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>
16+
<PackAsTool>true</PackAsTool>
17+
<ToolCommandName>devskim</ToolCommandName>
18+
<PackageTags>Security Linter</PackageTags>
19+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
20+
<PackageIcon>devskim-icon-128.png</PackageIcon>
21+
<PackageProjectUrl>https://github.com/Microsoft/DevSkim</PackageProjectUrl>
22+
<PackageVersion>0.0.0</PackageVersion>
1723
</PropertyGroup>
1824

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

38+
<ItemGroup>
39+
<None Include="..\Content\LICENSE.txt" Pack="true" PackagePath=""/>
40+
<None Include="..\Content\devskim-icon-128.png" Pack="true" PackagePath=""/>
41+
</ItemGroup>
3242
</Project>

‎DevSkim-DotNet/Microsoft.DevSkim.VSExtension/Content/License.txt

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
Copyright (c) 2016 Microsoft Corporation
2-
3-
All rights reserved.
1+
Copyright (c) Microsoft Corporation. All rights reserved.
42

53
MIT License
64

7-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
8-
files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
9-
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
10-
is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1111

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

14-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
15-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
16-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
17-
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj

+13-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp3.1;net48;</TargetFrameworks>
55
<PackageId>Microsoft.DevSkim</PackageId>
6-
<PackageVersion>0.3.8</PackageVersion>
6+
<PackageVersion>0.0.0</PackageVersion>
77
<Authors>Microsoft</Authors>
88
<PackageTags>Security Linter</PackageTags>
99
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
10-
<PackageLicenseUrl>https://github.com/Microsoft/DevSkim/blob/master/LICENSE.txt</PackageLicenseUrl>
10+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
1111
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
12-
<Description>DevSkim is a framework and Language analyzer that provide inline security analysis</Description>
13-
<PackageIconUrl>https://raw.githubusercontent.com/Microsoft/DevSkim/master/media/64x64.png</PackageIconUrl>
12+
<Description>DevSkim is a framework and language analyzer that provides inline security analysis.</Description>
13+
<PackageIcon>devskim-icon-128.png</PackageIcon>
1414
<PackageProjectUrl>https://github.com/Microsoft/DevSkim</PackageProjectUrl>
15-
<RepositoryUrl></RepositoryUrl>
1615
</PropertyGroup>
17-
1816
<ItemGroup>
1917
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
2018
</ItemGroup>
@@ -25,13 +23,18 @@
2523
</ItemGroup>
2624

2725
<ItemGroup>
28-
<EmbeddedResource Include="Resources\comments.json" />
2926
<EmbeddedResource Include="Resources\devskim-rules.json" />
27+
<EmbeddedResource Include="Resources\comments.json" />
3028
<EmbeddedResource Include="Resources\languages.json" />
3129
</ItemGroup>
32-
33-
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
30+
31+
<ItemGroup>
32+
<None Include="..\Content\LICENSE.txt" Pack="true" PackagePath=""/>
33+
<None Include="..\Content\devskim-icon-128.png" Pack="true" PackagePath=""/>
34+
</ItemGroup>
35+
36+
<Target Name="PreBuild" BeforeTargets="BeforeCompile">
3437
<Exec Command="dotnet ../../RulePacker/devskim.dll pack ../../rules Resources/devskim-rules.json" />
3538
</Target>
36-
39+
3740
</Project>

‎LICENSE.txt

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
Copyright (c) 2016 Microsoft Corporation
2-
3-
All rights reserved.
1+
Copyright (c) Microsoft Corporation. All rights reserved.
42

53
MIT License
64

7-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
8-
files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
9-
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
10-
is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1111

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

14-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
15-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
16-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
17-
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎Pipelines/devskim-core.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,19 @@ stages:
120120
publishWebProjects: false
121121
zipAfterPublish: false
122122
- task: DotNetCoreCLI@2
123-
displayName: Pack Nupkg
123+
displayName: Pack Nupkg (Lib)
124124
inputs:
125125
command: 'custom'
126126
custom: 'pack'
127127
arguments: 'Microsoft.DevSkim -c Release -o $(Build.BinariesDirectory)\nuget\DevSkim_$(ReleaseVersion)'
128128
workingDirectory: '$(SolutionDirectory)'
129+
- task: DotNetCoreCLI@2
130+
displayName: Pack Nupkg (Dotnet Tool)
131+
inputs:
132+
command: 'custom'
133+
custom: 'pack'
134+
arguments: 'Microsoft.DevSkim.CLI -c Release -o $(Build.BinariesDirectory)\nuget\DevSkim_$(ReleaseVersion)'
135+
workingDirectory: '$(SolutionDirectory)'
129136
- task: AntiMalware@3
130137
displayName: Anti-Malware Scan
131138
inputs:
@@ -360,7 +367,7 @@ stages:
360367
MaxConcurrency: '50'
361368
MaxRetryAttempts: '5'
362369
- task: EsrpCodeSigning@1
363-
displayName: Code Sign Nuget Package
370+
displayName: Code Sign Nuget Packages
364371
inputs:
365372
ConnectedServiceName: 'Devskim_CodeSign'
366373
FolderPath: '$(Build.BinariesDirectory)/nuget/DevSkim_$(ReleaseVersion)'
@@ -431,7 +438,7 @@ stages:
431438
Add-Content $(Build.StagingDirectory)\HASHES.txt "$tmp`t$name"
432439
}
433440
- task: PowerShell@2
434-
displayName: Move Nuget Package
441+
displayName: Move Nuget Packages
435442
inputs:
436443
targetType: 'inline'
437444
script: 'mv $env:BUILD_BINARIESDIRECTORY/nuget/DevSkim_$(ReleaseVersion)/*.nupkg $env:BUILD_STAGINGDIRECTORY/'
@@ -459,5 +466,5 @@ stages:
459466
command: 'push'
460467
packagesToPush: '$(Build.StagingDirectory)/*.nupkg'
461468
nuGetFeedType: 'external'
462-
publishFeedCredentials: 'DevSkim Nuget CI'
469+
publishFeedCredentials: 'CST-E Nuget CI'
463470
verbosityPush: 'Normal'

0 commit comments

Comments
 (0)
Please sign in to comment.