Skip to content

Commit 353e06f

Browse files
daalcantdaalcant
authored
Update projects for NuGet packaging, Add NBGitVersioning, Update pipeline (#154)
* Update projects for package builds, add gitversioning, update pipeline
1 parent bb12bf2 commit 353e06f

File tree

9 files changed

+532
-325
lines changed

9 files changed

+532
-325
lines changed

‎AppInspector.CLI/AppInspector.CLI.csproj

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,23 @@
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<RootNamespace>Microsoft.ApplicationInspector.CLI</RootNamespace>
77
<AssemblyName>ApplicationInspector.CLI</AssemblyName>
8-
<Copyright>(c) Microsoft Corporation. All rights reserved</Copyright>
8+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
99
<Product>Application Inspector</Product>
1010
<Company>Microsoft</Company>
1111
<Authors>Microsoft</Authors>
1212
<Version>0.0.0-placeholder</Version>
1313
<Description>Command line tool for GUI launch of Application Inspector</Description>
1414
<FileVersion>0.0.0.0</FileVersion>
1515
<AssemblyVersion>0.0.0.0</AssemblyVersion>
16+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
17+
<PackAsTool>true</PackAsTool>
18+
<PackageId>Microsoft.CST.ApplicationInspector.CLI</PackageId>
19+
<PackageVersion>0.0.0</PackageVersion>
20+
<PackageProjectUrl>https://github.com/microsoft/ApplicationInspector</PackageProjectUrl>
21+
<PackageTags>Security Static Analyzer</PackageTags>
22+
<ToolCommandName>appinspector</ToolCommandName>
23+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
24+
<PackageIcon>icon-128.png</PackageIcon>
1625
</PropertyGroup>
1726

1827
<ItemGroup>
@@ -152,5 +161,9 @@
152161
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
153162
</None>
154163
</ItemGroup>
155-
164+
165+
<ItemGroup>
166+
<None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
167+
<None Include="..\icon-128.png" Pack="true" PackagePath=""/>
168+
</ItemGroup>
156169
</Project>

‎AppInspector/AppInspector.Commands.csproj

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,35 @@
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<PackageId>Microsoft.ApplicationInspector.Commands</PackageId>
6+
<PackageId>Microsoft.CST.ApplicationInspector.Commands</PackageId>
77
<PackageVersion>0.0.0-placeholder</PackageVersion>
88
<PackageProjectUrl>https://github.com/microsoft/ApplicationInspector</PackageProjectUrl>
99
<RepositoryUrl>https://github.com/microsoft/ApplicationInspector</RepositoryUrl>
1010
<PackageTags>Security Static Analyzer</PackageTags>
1111
<Description>Characterizes software features.</Description>
12-
<Copyright>(c) Microsoft Corporation. All rights reserved</Copyright>
12+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1313
<HighEntropyVA>true</HighEntropyVA>
1414
<Product>Application Inspector</Product>
1515
<Authors>Microsoft</Authors>
1616
<Version>0.0.0-placeholder</Version>
1717
<AssemblyName>ApplicationInspector.Commands</AssemblyName>
1818
<RootNamespace>Microsoft.ApplicationInspector.Commands</RootNamespace>
19-
<StartupObject></StartupObject>
2019
<Company>Microsoft</Company>
2120
<SignAssembly>true</SignAssembly>
22-
<AssemblyVersion>1.0.28.0</AssemblyVersion>
23-
<FileVersion>1.0.28.0</FileVersion>
24-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
25-
<ApplicationIcon />
21+
<AssemblyVersion>0.0.0</AssemblyVersion>
22+
<FileVersion>0.0.0</FileVersion>
23+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
24+
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
25+
<PackageIcon>icon-128.png</PackageIcon>
26+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
2627
</PropertyGroup>
2728

29+
<Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
30+
<ItemGroup>
31+
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))"/>
32+
</ItemGroup>
33+
</Target>
34+
2835
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
2936
<DefineConstants>TRACE</DefineConstants>
3037
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,24 +65,27 @@
5865
</EmbeddedResource>
5966
</ItemGroup>
6067

61-
<ItemGroup>
62-
<Compile Remove="linux\**" />
63-
<EmbeddedResource Remove="linux\**" />
64-
<None Remove="linux\**" />
65-
</ItemGroup>
66-
6768
<ItemGroup>
6869
<None Update="rules\**">
6970
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
7071
</None>
7172
</ItemGroup>
7273

7374
<ItemGroup>
74-
<ProjectReference Include="..\MultiExtractor\MultiExtractor.csproj" />
75-
<ProjectReference Include="..\RulesEngine\AppInspector.RulesEngine.csproj" />
75+
<ProjectReference Include="..\MultiExtractor\MultiExtractor.csproj">
76+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
77+
<IncludeAssets>MultiExtractor.dll</IncludeAssets>
78+
</ProjectReference>
79+
80+
<ProjectReference Include="..\RulesEngine\AppInspector.RulesEngine.csproj">
81+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
82+
<IncludeAssets>ApplicationInspector.RulesEngine.dll</IncludeAssets>
83+
</ProjectReference>
7684
</ItemGroup>
7785

78-
79-
<ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
86+
<ItemGroup>
87+
<None Include="..\LICENSE.txt" Pack="true" PackagePath=""/>
88+
<None Include="..\icon-128.png" Pack="true" PackagePath=""/>
89+
</ItemGroup>
8090

8191
</Project>

‎Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<PackageReference Include="Nerdbank.GitVersioning">
5+
<Version>3.0.50</Version>
6+
<PrivateAssets>all</PrivateAssets>
7+
</PackageReference>
8+
</ItemGroup>
9+
</Project>

‎MultiExtractor/MultiExtractor.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<PackageId>Microsoft.MultiExtractor</PackageId>
6-
<Authors>Michael Scovetta,Guy Acosta</Authors>
6+
<Authors>Microsoft</Authors>
77
<Company>Microsoft</Company>
88
<Description>MultiExtractor is a library for performing file extraction from many different types of file archives, recursively.</Description>
9-
<Copyright>Microsoft</Copyright>
9+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1010
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
1212
</PropertyGroup>
1313

1414
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

0 commit comments

Comments
 (0)