Skip to content

Dogfooding #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdeago merged 9 commits into from
Aug 18, 2020
Merged

Dogfooding #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
622c3d4
Clarify the note to contributors in Sdk\PackageVersions.props
rdeago Aug 18, 2020
fe884b4
Remove redundant definition of UseJetBrainsAnnotations.
rdeago Aug 18, 2020
ed65887
Improve automatic discovery of license, thrid-paty notice, and packag…
rdeago Aug 18, 2020
700286d
[ADD] Support for .nuspec file alongside project.
rdeago Aug 18, 2020
c4088bd
Restructure project type detection code.
rdeago Aug 18, 2020
5f56a3b
Add global.json to build using .NET SDK 3.1.300 or higher, but NOT .N…
rdeago Aug 18, 2020
8716cd7
[ADD] Support for projects using Microsoft.Build.NoTargets SDK.
rdeago Aug 18, 2020
51ac0cf
Ditch build scripts; use Microsoft.Build.NoTargets + Buildvana.Sdk
rdeago Aug 18, 2020
e15c993
[FIX] Authors are duplicated as owners in nuspec file.
rdeago Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>

<!-- Branding, ownership, and licensing -->
<PropertyGroup>
<Product>Buildvana.Sdk</Product>
<Authors>rdeago</Authors>
<Owners>Buildvana</Owners>
<Copyright>Copyright (C) 2020 Riccardo De Agostini.</Copyright>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>

<!-- Repository and documentation -->
<PropertyGroup>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Buildvana/Buildvana.Sdk</RepositoryUrl>
<PackageProjectUrl>https://github.com/Buildvana/Buildvana</PackageProjectUrl>
<PackageReleaseNotes>Release notes are available at https://github.com/Buildvana/Buildvana.Sdk/blob/master/CHANGELOG.md</PackageReleaseNotes>
</PropertyGroup>

</Project>
39 changes: 3 additions & 36 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>

<Import Project="$(MSBuildThisFileDirectory)build\MSBuild.Packaging.props"/>
<!-- DO NOT MODIFY THIS FILE! Create or modify Common.props instead. -->

<!-- Branding, ownership, and licensing -->
<PropertyGroup>
<Product>Buildvana.Sdk</Product>
<Authors>rdeago</Authors>
<Owners>Buildvana</Owners>
<Copyright>Copyright (C) 2020 Buildvana contributors.</Copyright>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)LICENSE" Link="LICENSE" Visible="false" Pack="true" />
<Content Include="$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES" Link="THIRD-PARTY-NOTICES" Visible="false" Pack="true" />
</ItemGroup>

<!-- Package Central Version Management -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<!-- Repository and documentation -->
<PropertyGroup>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Buildvana/Buildvana.Sdk</RepositoryUrl>
<PackageProjectUrl>https://github.com/Buildvana/Buildvana</PackageProjectUrl>
<PackageReleaseNotes>Release notes are available at https://github.com/Buildvana/Buildvana.Sdk/blob/master/CHANGELOG.md</PackageReleaseNotes>
</PropertyGroup>

<!-- Package icon -->
<PropertyGroup>
<PackageIcon>$(Product).png</PackageIcon>
</PropertyGroup>
<ItemGroup>
<Content Include="$(MSBuildThisFileDirectory)graphics\PackageIcon.png" Link="$(Product).png" Visible="false" Pack="true" />
</ItemGroup>
<Import Project="Sdk.props" Sdk="Buildvana.Sdk" Version="0.1.0" />

</Project>
13 changes: 3 additions & 10 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>

<Import Project="$(MSBuildThisFileDirectory)build\MSBuild.Packaging.targets"/>
<!-- DO NOT MODIFY THIS FILE! Create or modify Common.targets instead. -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>

<!-- Put packages in artifacts folder. -->
<PropertyGroup>
<PackageOutputPath>$(MSBuildThisFileDirectory)artifacts\$(Configuration)\</PackageOutputPath>
</PropertyGroup>
<Import Project="Sdk.targets" Sdk="Buildvana.Sdk" Version="0.1.0" />

</Project>
7 changes: 0 additions & 7 deletions Directory.Packages.props
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions build/MSBuild.Packaging.props
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions build/MSBuild.Packaging.targets
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "3.1.300",
"rollForward": "latestMinor"
}
}
9 changes: 6 additions & 3 deletions src/Buildvana.Sdk/Buildvana.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.Build.NoTargets/2.0.1">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageOnlyBuild>true</PackageOnlyBuild>
<IsPackable>true</IsPackable>
<Title>Buildvana SDK</Title>
<Summary>An opinionated, best-practices-based, CI-friendly, VS-friendly, MSBuild-powered build system for .NET projects.</Summary>
<Description>Documentation is available here: https://github.com/Buildvana/Buildvana.Sdk/blob/master/README.md</Description>
<Version>0.1.0</Version>
<PackageTags>build;msbuild;sdk;dotnet</PackageTags>
<PackageType>MSBuildSdk</PackageType>
<DevelopmentDependency>true</DevelopmentDependency>
<Serviceable>true</Serviceable>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Buildvana.Sdk/Buildvana.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<metadata>
<id>$id$</id>
<title>$title$</title>
<owners>$authors$</owners>
<owners>$owners$</owners>
<authors>$authors$</authors>
<version>$version$</version>
<copyright>$copyright$</copyright>
Expand Down
10 changes: 3 additions & 7 deletions src/Buildvana.Sdk/Modules/JetBrainsAnnotations/Module.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<Project>

<PropertyGroup>
<UseJetBrainsAnnotations Condition="'$(UseJetBrainsAnnotations)' == ''">true</UseJetBrainsAnnotations>
<UseJetBrainsAnnotations Condition="'$(UseJetBrainsAnnotations)' != 'true'">false</UseJetBrainsAnnotations>
</PropertyGroup>

<!-- Add ReSharper-related package references where appropriate. -->
<ItemGroup Condition="$(UseJetBrainsAnnotations)">
<!-- Add ReSharper-related package references where appropriate,
except for no-targets projects. -->
<ItemGroup Condition="$(UseJetBrainsAnnotations) And !$(BV_IsNoTargetsProject)">
<PackageReference Include="JetBrains.Annotations"
IsImplicitlyDefined="true"
PrivateAssets="All" />
Expand Down
Loading