Skip to content

Commit

Permalink
housekeeping: Added Central Package Versioning (#53)
Browse files Browse the repository at this point in the history
  • Loading branch information
RLittlesII authored Mar 21, 2022
1 parent 89cb204 commit 5259a9f
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="ReactiveUI" Version="11.*" />
<PackageReference Include="BenchmarkDotNet" />
<PackageReference Include="ReactiveUI" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveMarbles.Mvvm.Benchmarks/directory.build.props
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('directory.build.props', '$(MSBuildThisFileDirectory)../'))" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('directory.build.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
16 changes: 8 additions & 8 deletions src/ReactiveMarbles.Mvvm.Tests/ReactiveMarbles.Mvvm.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DynamicData" Version="7.4.9" />
<PackageReference Include="FluentAssertions" Version="6.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
<PackageReference Include="ReactiveUI" Version="11.5.35" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="DynamicData" />
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Reactive.Testing" />
<PackageReference Include="ReactiveUI" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/ReactiveMarbles.Mvvm/ReactiveMarbles.Mvvm.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DynamicData" Version="7.4.9" />
<PackageReference Include="ReactiveMarbles.Locator" Version="1.1.4" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="DynamicData" />
<PackageReference Include="ReactiveMarbles.Locator" />
<PackageReference Include="System.Reactive" />
</ItemGroup>

</Project>
25 changes: 15 additions & 10 deletions src/directory.build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project>
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Platform>AnyCPU</Platform>
<IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
<DebugType>embedded</DebugType>
<Authors>ReactiveUI Association Inc</Authors>
<Copyright>Copyright (c) 2021 ReactiveUI Association Inc</Copyright>
<Company>ReactiveUI Association Inc</Company>
<Copyright>Copyright (c) ReactiveUI Association Inc © $([System.DateTime]::Now.ToString('yyyy'))</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/reactivemarbles/Mvvm</PackageProjectUrl>
<PackageDescription>Common base classes for the MVVM pattern for Reactive Marbles.</PackageDescription>
Expand All @@ -15,6 +12,13 @@
<PackageReleaseNotes>https://github.com/reactivemarbles/Mvvm/releases</PackageReleaseNotes>
<RepositoryUrl>https://github.com/reactivemarbles/Mvvm</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<Nullable>enable</Nullable>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Platform>AnyCPU</Platform>
<IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
<DebugType>embedded</DebugType>

<!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand All @@ -25,7 +29,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
Expand All @@ -38,22 +42,23 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231">
<PackageReference Include="Nerdbank.GitVersioning">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
<PackageReference Include="Microsoft.SourceLink.GitHub" IncludeAssets="analyzers;build;buildMultitargeting;buildTransitive" PrivateAssets="All" />
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
<PackageReference Include="Roslynator.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
Expand Down
1 change: 0 additions & 1 deletion src/directory.build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
</PropertyGroup>

<Target Name="ValidateNugetProperties" Condition="!$(IsTestProject) or $(IsTestProject) == ''" BeforeTargets="Compile">
<Error Condition="$(PackageDescription) == '' or $(PackageDescription) == $(DefaultPackageDescription)" Text="The Nuget PackageDescription property needs to be set for the project. Currently : '$(PackageDescription)'" />
</Target>
Expand Down
47 changes: 47 additions & 0 deletions src/directory.packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project>
<ItemGroup>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.4.231" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.354" />
<PackageVersion Include="Roslynator.Analyzers" Version="3.2.2" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
<PackageVersion Include="ReactiveUI" Version="11.5.35" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="DynamicData" Version="7.4.9" />
<PackageVersion Include="ReactiveMarbles.Locator" Version="1.1.4" />
<PackageVersion Include="System.Reactive" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
<PackageVersion Include="coverlet.msbuild" Version="3.1.2" />
<PackageVersion Include="FluentAssertions" Version="6.5.1" />
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.16.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<PackageVersion Include="xunit" Version="2.4.1" />
<PackageVersion Include="xunit.analyzers" Version="0.10.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageVersion Include="coverlet.collector" Version="3.1.0" />
</ItemGroup>
<Import
Project="$(MSBuildThisFileDirectory)/directory.packages.support.props"
Condition="Exists('$(MSBuildThisFileDirectory)/directory.packages.support.props')"
/>
</Project>

0 comments on commit 5259a9f

Please sign in to comment.