Skip to content

Commit 970089f

Browse files
tautropflitautropfli
authored
Merge pull request #3 from polyadic/release-1.1.0
2 parents f5ea157 + 047484d commit 970089f

File tree

6 files changed

+46
-18
lines changed

6 files changed

+46
-18
lines changed

‎CodeStyle/CodeStyle.csproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.Build.NoTargets">
33
<PropertyGroup>
4-
<Version>1.0.0</Version>
4+
<Version>1.1.0</Version>
55
<PackageId>Polyadic.CodeStyle</PackageId>
66
<PackageTags>analyzers</PackageTags>
77
<Description>Various analyzers bundled with opinionated configuration</Description>
@@ -15,13 +15,11 @@
1515
<TargetFramework>netstandard2.0</TargetFramework>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.2" PrivateAssets="none" />
18+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8" PrivateAssets="none" />
1919
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="none" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<None Include="build\**\*">
23-
<Pack>true</Pack>
24-
<PackagePath>%(Identity)</PackagePath>
25-
</None>
22+
<None Include="build\**\*" Pack="true" PackagePath="%(Identity)" />
23+
<None Include="buildMultiTargeting\**\*" Pack="true" PackagePath="%(Identity)" />
2624
</ItemGroup>
2725
</Project>

‎CodeStyle/build/Polyadic.CodeStyle.targets‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Target Name="_PolyadicCodeStylePreventLocalPack" BeforeTargets="Pack" Condition="'$(ContinuousIntegrationBuild)' != 'true' And '$(IsPackable)' == 'true'">
4-
<PropertyGroup>
5-
<_WorkflowUrl>$(PackageProjectUrl)/actions?query=branch%253Amain</_WorkflowUrl>
6-
<_LinkPrefix>%1b]8;;</_LinkPrefix>
7-
<_LinkInfix>%1b\</_LinkInfix>
8-
<_LinkSuffix>$(_LinkPrefix)$(_LinkInfix)</_LinkSuffix>
9-
</PropertyGroup>
10-
<Error Text="Do not publish locally built packages to NuGet.org.
11-
Download the artifacts $(_LinkPrefix)$(_WorkflowUrl)$(_LinkInfix)published on GitHub Actions$(_LinkSuffix) instead.
12-
You can alternatively run `dotnet pack /p:ContinuousIntegrationBuild=true`." />
13-
</Target>
3+
<!-- Only run when we're not a multi-targeting project as that is covered by buildMultiTargeting/Polyadic.CodeStyle.targets. -->
4+
<Import Project="$(MSBuildThisFileDirectory)PreventLocalPack.targets" Condition="'$(TargetFrameworks)' == ''" />
145
</Project>

‎CodeStyle/build/PreventLocalPack.targets‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Target Name="_PolyadicCodeStylePreventLocalPack" BeforeTargets="Pack"
4+
Condition="'$(ContinuousIntegrationBuild)' != 'true' And '$(IsPackable)' == 'true' And '$(ApiCompatGenerateSuppressionFile)' != 'true'">
5+
<PropertyGroup>
6+
<_WorkflowUrl>$(PackageProjectUrl)/actions?query=branch%253Amain</_WorkflowUrl>
7+
<_LinkPrefix>%1b]8;;</_LinkPrefix>
8+
<_LinkInfix>%1b\</_LinkInfix>
9+
<_LinkSuffix>$(_LinkPrefix)$(_LinkInfix)</_LinkSuffix>
10+
</PropertyGroup>
11+
<Error Text="Do not publish locally built packages to NuGet.org.
12+
Download the artifacts $(_LinkPrefix)$(_WorkflowUrl)$(_LinkInfix)published on GitHub Actions$(_LinkSuffix) instead.
13+
You can alternatively run `dotnet pack /p:ContinuousIntegrationBuild=true`." />
14+
</Target>
15+
</Project>

‎CodeStyle/buildMultiTargeting/Polyadic.CodeStyle.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildThisFileDirectory)..\build\PreventLocalPack.targets" />
4+
</Project>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Shared Code Style for all Polyadic/Funcky projects.
99

1010
## Usage
1111

12-
```
12+
```xml
1313
<PackageReference Include="Polyadic.CodeStyle" Version="..." />
1414
```
1515

‎changelog.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,21 @@
11
# Changelog
2+
## 1.1.0
3+
* Disallow packing without enabling `ContinuousIntegrationBuild`.
4+
* Update `IDisposableAnalyzers` from 4.0.2 to 4.0.8. \
5+
Excerpt from their [Release Notes](https://github.com/DotNetAnalyzers/IDisposableAnalyzers/blob/master/RELEASE_NOTES.md):
6+
> #### 4.0.7
7+
> BUGFIX: Handle target typed new
8+
>
9+
> #### 4.0.6
10+
> BUGFIX: Handle ref struct
11+
> BUGFIX: Handle target typed new
12+
>
13+
> #### 4.0.5
14+
> BUGFIX: Handle ValueTask
15+
> BUGFIX: awaited in expression
16+
>
17+
> #### 4.0.3
18+
> * BUGFIX: Handle recursive builder
19+
20+
## 1.0.0
21+
Initial release

0 commit comments

Comments
 (0)