Skip to content

Commit

Permalink
Update solution-level files.
Browse files Browse the repository at this point in the history
  • Loading branch information
sharpjs committed May 21, 2022
1 parent 870b643 commit 3e246fc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<VersionPrefix>2.1.0</VersionPrefix>
<Authors>Jeffrey Sharp</Authors>
<Company>Subatomix Research Inc.</Company>
<Copyright>Copyright $([System.DateTime]::UtcNow.Year) $(Authors)</Copyright>
<Copyright>© $([System.DateTime]::UtcNow.Year) $(Authors)</Copyright>
<PackageLicenseExpression>ISC</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sharpjs/Subatomix.Testing</PackageProjectUrl>
<PackageTags>Testing Coverage</PackageTags>
Expand All @@ -42,8 +42,8 @@
<!-- Build properties -->
<PropertyGroup>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<!-- Packaging properties -->
Expand Down
12 changes: 6 additions & 6 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build
-->

<ItemGroup Condition="$(IsPackable)">
<ItemGroup Condition="'$(IsPackable)' == 'true'">
<None Include="..\icon.png" Link="Properties\icon.png"
Pack="true" PackagePath="" CopyToOutputDirectory="Never" />
<None Include="..\LICENSE.txt" Link="Properties\LICENSE.txt"
Expand All @@ -42,17 +42,17 @@

<!-- Versioning -->
<ItemGroup>
<PackageReference Include="Subatomix.Build.Versioning.Semantic" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Subatomix.Build.Versioning.Semantic" Version="1.0.0" PrivateAssets="all" />
</ItemGroup>

<!-- <inheritdoc/> support -->
<ItemGroup>
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
<PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="all" />
</ItemGroup>

<!-- SourceLink https://github.com/dotnet/sourcelink/blob/master/README.md -->
<ItemGroup Condition="$(IsPackable)">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<!-- SourceLink https://github.com/dotnet/sourcelink/blob/main/README.md -->
<ItemGroup Condition="'$(IsPackable)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
</ItemGroup>

</Project>
9 changes: 8 additions & 1 deletion Make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ param (
# Build, run tests, produce code coverage report.
[Parameter(Mandatory, ParameterSetName="Coverage")]
[switch] $Coverage
,
# Do not build before running tests.
[Parameter(ParameterSetName="Test")]
[Parameter(ParameterSetName="Coverage")]
[switch] $NoBuild
,
# The configuration to build: Debug or Release. The default is Debug.
[Parameter(ParameterSetName="Build")]
Expand Down Expand Up @@ -78,7 +83,9 @@ function Main {
return
}

Invoke-Build
if (!$NoBuild) {
Invoke-Build
}

if ($Test -or $Coverage) {
Invoke-Test
Expand Down

0 comments on commit 3e246fc

Please sign in to comment.