Skip to content

Commit 39df0fa

Browse files
authored
housekeeping: System Reactive 6.0 update (#702)
1 parent e431a5d commit 39df0fa

5 files changed

Lines changed: 12 additions & 18 deletions

File tree

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
33
<TargetFrameworks>net6.0</TargetFrameworks>
44
<NoWarn>$(NoWarn);CS0618</NoWarn>
@@ -7,18 +7,14 @@
77
<ItemGroup>
88
<ProjectReference Include="..\..\src\DynamicData\DynamicData.csproj" />
99
</ItemGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="System.Reactive" Version="5.0.0" />
13-
</ItemGroup>
1410

1511
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
1713
<PackageReference Include="xunit" Version="2.4.2" />
1814
<PackageReference Include="xunit.runner.console" Version="2.4.2" />
1915
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
2016
<PackageReference Include="FluentAssertions" Version="6.11.0" />
21-
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
17+
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
2218
</ItemGroup>
2319

2420
</Project>

src/Directory.Build.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
<DebugType>embedded</DebugType>
1111
<Authors>Roland Pheasant</Authors>
1212
<Owners>Roland Pheasant</Owners>
13-
<Copyright>Copyright (c) Roland Pheasant 2011-2022</Copyright>
13+
<Copyright>Copyright (c) Roland Pheasant 2011-$([System.DateTime]::Now.ToString(yyyy))</Copyright>
1414
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1515
<PackageProjectUrl>http://dynamic-data.org</PackageProjectUrl>
1616
<PackageTags>DynamicData;Dynamic;Data;Rx;Reactive;Observable;Cache;Binding;ObservableCache;ObservableList;ObservableCollection;Collection;Linq</PackageTags>
1717
<PackageReleaseNotes>https://github.com/reactiveui/DynamicData/releases</PackageReleaseNotes>
1818
<RepositoryUrl>https://github.com/reactiveui/DynamicData</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<PackageIcon>logo.png</PackageIcon>
21+
<PackageReadmeFile>README.md</PackageReadmeFile>
2122
<EnableNETAnalyzers>true</EnableNETAnalyzers>
2223

2324
<!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
@@ -45,6 +46,7 @@
4546

4647
<ItemGroup>
4748
<None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\"/>
49+
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\"/>
4850
</ItemGroup>
4951
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
5052
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
@@ -59,7 +61,7 @@
5961
</ItemGroup>
6062

6163
<ItemGroup>
62-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.128" PrivateAssets="all" />
64+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.132" PrivateAssets="all" />
6365
</ItemGroup>
6466
<ItemGroup Condition="!$(IsTestProject) AND !$(IsBenchmarkProject)">
6567
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />

src/DynamicData.Tests/DynamicData.Tests.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
33
<TargetFrameworks>net6.0</TargetFrameworks>
44
<NoWarn>$(NoWarn);CS0618;CA1801;CA1063;CS8767;CS8602; CS8618</NoWarn>
@@ -11,16 +11,12 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="System.Reactive" Version="5.0.0" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
1915
<PackageReference Include="xunit" Version="2.4.2" />
2016
<PackageReference Include="xunit.runner.console" Version="2.4.2" />
2117
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
2218
<PackageReference Include="FluentAssertions" Version="6.11.0" />
23-
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
19+
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
2420
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
2521
<PrivateAssets>all</PrivateAssets>
2622
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/DynamicData/DynamicData.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="System.Reactive" Version="5.0.0" />
12+
<PackageReference Include="System.Reactive" Version="6.0.0" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "7.13",
2+
"version": "7.14",
33
"publicReleaseRefSpec": [
44
"^refs/heads/main$", // we release out of master
55
"^refs/heads/preview/.*", // we release previews

0 commit comments

Comments
 (0)