Skip to content

Commit

Permalink
Use Common paths for Build, Publish and Pack
Browse files Browse the repository at this point in the history
The new Output paths point to...

Build: `~build\...`
Restore: `~build\ext`
Publish: `~publish\...`
Pack: `~publish\{bin,obj}`
  • Loading branch information
Nirmal4G committed Apr 12, 2022
1 parent ef7d9ec commit a5327a7
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Working folders
~build/
~publish/

# Build results
[Dd]ebug/
[Dd]ebugPublic/
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>

<Import Project="Directory.Solution.props" />

<PropertyGroup>
<RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
<BuildToolsDirectory>$(RepositoryDirectory)build\</BuildToolsDirectory>
Expand All @@ -11,7 +13,6 @@
<When Condition="$(IsCoreProject)">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageOutputPath>$(RepositoryDirectory)bin\nupkg</PackageOutputPath>
<TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
</PropertyGroup>
</When>
Expand Down
7 changes: 7 additions & 0 deletions Directory.Solution.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>

<PropertyGroup>
<RestoreUseStaticGraphEvaluation>True</RestoreUseStaticGraphEvaluation>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ jobs:
env:
SignClientUser: $(SignClientUser)
SignClientSecret: $(SignClientSecret)
ArtifactDirectory: bin/nupkg
ArtifactDirectory: ~packages/bin
condition: and(succeeded(), not(eq(variables['Build.Reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))

# Publish build artifacts
- publish: bin/nupkg
- publish: ~packages/bin
artifact: Packages
displayName: Publish package artifacts
15 changes: 15 additions & 0 deletions build/Community.Toolkit.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,19 @@
<ContinuousIntegrationBuild>$(TF_BUILD)</ContinuousIntegrationBuild>
</PropertyGroup>

<PropertyGroup>
<!-- Common Outputs -->
<BuildDir>~build\</BuildDir>
<PublishDir>~publish\</PublishDir>
<!-- Build Outputs -->
<BaseOutputPath>$(BuildDir)bin\</BaseOutputPath>
<BaseIntermediateOutputPath>$(BuildDir)obj\</BaseIntermediateOutputPath>
<!-- Restore Outputs-->
<MSBuildProjectExtensionsPath>$(BuildDir)ext\</MSBuildProjectExtensionsPath>
<RestoreOutputPath>$(MSBuildProjectExtensionsPath)</RestoreOutputPath>
<!-- Pack Outputs -->
<PackageOutputPath>$(RepositoryDirectory)~packages\bin\</PackageOutputPath>
<NuSpecOutputPath>$(RepositoryDirectory)~packages\obj\</NuSpecOutputPath>
</PropertyGroup>

</Project>
5 changes: 5 additions & 0 deletions build/Community.Toolkit.Common.targets
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
<PackageTags Condition="'$(PackageTags)' == ''">$(CommonTags)</PackageTags>
</PropertyGroup>

<PropertyGroup>
<!-- Exclude files and folders from build and publish across all projects -->
<DefaultItemExcludes>$(BuildDir)**;$(PublishDir)**;$(DefaultItemExcludes)</DefaultItemExcludes>
</PropertyGroup>

<ItemGroup Condition="$(IsPackable)">
<None Pack="true" PackagePath="\" Visible="False" Include="$(BuildToolsDirectory)Icon.png" />
<None Pack="true" PackagePath="\" Visible="False" Include="$(RepositoryDirectory)License.md" />
Expand Down

0 comments on commit a5327a7

Please sign in to comment.