Skip to content

Commit

Permalink
Update to latest build process to build .snupkg with only the .pdbs
Browse files Browse the repository at this point in the history
  • Loading branch information
robmen committed Mar 1, 2021
1 parent 92fb111 commit 2db1935
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 22 deletions.
43 changes: 32 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,24 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Mono auto generated files
mono_crash.*

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand All @@ -39,9 +44,10 @@ Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml

# Build Results of an ATL Project
[Dd]ebugPS/
Expand All @@ -56,6 +62,9 @@ project.lock.json
project.fragment.lock.json
artifacts/

# ASP.NET Scaffolding
ScaffoldingReadMe.txt

# StyleCop
StyleCopReport.xml

Expand Down Expand Up @@ -122,9 +131,6 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

Expand All @@ -135,6 +141,11 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json

# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info

# Visual Studio code coverage results
*.coverage
*.coveragexml
Expand Down Expand Up @@ -182,6 +193,8 @@ PublishScripts/

# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
Expand All @@ -206,6 +219,8 @@ BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload

# Visual Studio cache files
# files ending in .cache can be ignored
Expand All @@ -231,8 +246,6 @@ orleans.codegen.cs
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
**/wwwroot/lib/

# RIA/Silverlight projects
Generated_Code/
Expand All @@ -257,6 +270,9 @@ ServiceFabricBackup/
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl

# Microsoft Fakes
FakesAssemblies/
Expand Down Expand Up @@ -292,10 +308,6 @@ paket-files/
# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush personal settings
.cr/personal

Expand Down Expand Up @@ -337,5 +349,14 @@ ASALocalRun/
# Local History for Visual Studio
.localhistory/

# BeatPulse healthcheck temp database
# BeatPulse healthcheck temp database
healthchecksdb

# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
4 changes: 1 addition & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<Product>WiX Toolset</Product>
</PropertyGroup>

<Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
<Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
<Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
<Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
<Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
</Project>
5 changes: 4 additions & 1 deletion src/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@
<ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>

<!-- Remove the package references that are now referenced as projects -->
<PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
<PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
</ItemGroup>

</When>
</Choose>

<Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
<Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
</Project>
2 changes: 2 additions & 0 deletions src/CSharp.Build.props → src/Directory.csproj.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
-->
<Project>
<PropertyGroup>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
<NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
</PropertyGroup>
</Project>
26 changes: 26 additions & 0 deletions src/Directory.csproj.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
<!--
Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
then update all of the repos.
-->
<Project>
<PropertyGroup>
<CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
<DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
Condition=" Exists('$(MSBuildProjectName).nuspec') ">
<PropertyGroup>
<ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>

<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
<NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
</Target>

</Project>
5 changes: 5 additions & 0 deletions src/Cpp.Build.props → src/Directory.vcxproj.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
<IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
<OutDir>$(OutputPath)$(Platform)\</OutDir>

<!-- NBGV properties -->
<AssemblyCompany>$(Company)</AssemblyCompany>
<AssemblyCopyright>$(Copyright)</AssemblyCopyright>

<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
</PropertyGroup>
Expand Down
8 changes: 1 addition & 7 deletions src/wixext/WixToolset.Dependency.wixext.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,13 @@
<Description>WiX Toolset Dependency Extension</Description>
<Title>WiX Toolset Dependency Extension</Title>
<IsTool>true</IsTool>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
</ItemGroup>

<ItemGroup>
<Content Include="$(MSBuildThisFileName).targets" PackagePath="build" />
<Content Include="$(OutputPath)..\**\*.pdb" PackagePath="pdbs\%(RelativeFolder)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
Expand Down
25 changes: 25 additions & 0 deletions src/wixext/WixToolset.Dependency.wixext.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata minClientVersion="4.0">
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<description>$description$</description>
<authors>$authors$</authors>
<license type="expression">MS-RL</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>$copyright$</copyright>
<projectUrl>$projectUrl$</projectUrl>
<repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
</metadata>

<files>
<file src="$projectFolder$$id$.targets" target="build" />

<file src="netstandard2.0\$id$.dll" target="tools" />

<file src="ARM64\*.pdb" target="pdbs\ARM64" />
<file src="x86\*.pdb" target="pdbs\x86" />
<file src="x64\*.pdb" target="pdbs\x64" />
</files>
</package>

0 comments on commit 2db1935

Please sign in to comment.