Skip to content

Commit

Permalink
Update nuget packages, target frameworks, and versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nihlus committed Nov 20, 2023
1 parent ebf7b29 commit 5f8de5d
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Remora.Sdk/Remora.Sdk.msbuildproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<Title>Remora.Sdk</Title>
<Description>Provides default properties and targets for Remora-style projects.</Description>
<VersionPrefix>2.1.2</VersionPrefix>
<VersionPrefix>3.0.0</VersionPrefix>
<PackageReleaseNotes>
Update nuget packages.
Ensure paths are clean on Linux.
Expand Down
6 changes: 3 additions & 3 deletions Remora.Sdk/Sdk/Sdk.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
Sdk.targets, too
-->
<ItemGroup>
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Remora.Sdk/Sdk/Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<!-- Default targeting configuration -->
<PropertyGroup>
<ExecutableFrameworks Condition="'$(ExecutableFrameworks)' == ''">net7.0</ExecutableFrameworks>
<LibraryFrameworks Condition="'$(LibraryFrameworks)' == ''">netstandard2.1;net6.0;$(ExecutableFrameworks)</LibraryFrameworks>
<ExecutableFrameworks Condition="'$(ExecutableFrameworks)' == ''">net8.0</ExecutableFrameworks>
<LibraryFrameworks Condition="'$(LibraryFrameworks)' == ''">netstandard2.1;net6.0;net7.0;$(ExecutableFrameworks)</LibraryFrameworks>
</PropertyGroup>

<!-- Default common properties -->
Expand Down
6 changes: 3 additions & 3 deletions Remora.Sdk/Sdk/Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="all" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(IsPackable)' == 'true'">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion Remora.Tests.Sdk/Remora.Tests.Sdk.msbuildproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup>
<Title>Remora.Tests.Sdk</Title>
<Description>Provides default properties and targets for Remora-style unit test projects.</Description>
<VersionPrefix>2.0.6</VersionPrefix>
<VersionPrefix>3.0.0</VersionPrefix>
<PackageReleaseNotes>
Update dependencies.
</PackageReleaseNotes>
Expand Down
10 changes: 5 additions & 5 deletions Remora.Tests.Sdk/Sdk/Sdk.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
Sdk.targets, too
-->
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageVersion Include="xunit.runner.console" Version="2.4.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit" Version="2.6.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
<PackageVersion Include="xunit.runner.console" Version="2.6.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="xunit.analyzers" Version="1.1.0"/>
<PackageVersion Include="xunit.analyzers" Version="1.6.0"/>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Remora.Tests.Sdk/Sdk/Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Defaults for centrally managed package versions -->
<Import Project="Sdk.Packages.props" />

<Import Project="Sdk.props" Sdk="Remora.Sdk" Version="2.1.2" Condition="'$(_RemoraInSourceBuild)' != 'true'"/>
<Import Project="Sdk.props" Sdk="Remora.Sdk" Version="3.0.0" Condition="'$(_RemoraInSourceBuild)' != 'true'"/>
<Import Project="../../Remora.Sdk/Sdk/Sdk.props" Condition="'$(_RemoraInSourceBuild)' == 'true'"/>

<!-- Override target frameworks -->
Expand Down
12 changes: 6 additions & 6 deletions Remora.Tests.Sdk/Sdk/Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,20 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Include="xunit.runner.console" Version="2.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
<PackageReference Include="xunit.runner.console" Version="2.6.2" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.analyzers" Version="1.1.0" PrivateAssets="all"/>
<PackageReference Include="xunit.analyzers" Version="1.6.0" PrivateAssets="all"/>
</ItemGroup>
</Otherwise>
</Choose>

<!-- Import at last to respect set properties -->
<Import Project="Sdk.targets" Sdk="Remora.Sdk" Version="2.1.2" Condition="'$(_RemoraInSourceBuild)' != 'true'"/>
<Import Project="Sdk.targets" Sdk="Remora.Sdk" Version="3.0.0" Condition="'$(_RemoraInSourceBuild)' != 'true'"/>
<Import Project="../../Remora.Sdk/Sdk/Sdk.targets" Condition="'$(_RemoraInSourceBuild)' == 'true'"/>
</Project>

0 comments on commit 5f8de5d

Please sign in to comment.