Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
kekyo committed Nov 16, 2023
2 parents da94e42 + ebd6729 commit 747aa5d
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 7 deletions.
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand Down
3 changes: 3 additions & 0 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ nuspecファイルを使ってパッケージを生成する場合は、デフ

## 履歴

* 3.3.0:
* .NET 8.0 SDKに対応しました。
* GitReaderを1.7.0に上げました。
* 3.2.60:
* ビルド時に`ThisAssembly`シンボルが参照できない場合があるのを修正。
* 3.2.50:
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,9 @@ When you are using a nuspec file to generate a NuGet package, there are addition

## History

* 3.3.0:.
* Added support for .NET 8.0 SDK.
* Updated GitReader to 1.7.0.
* 3.2.60:
* Fixed the `ThisAssembly` symbol could not be referenced at build time.
* 3.2.50:
Expand Down
6 changes: 3 additions & 3 deletions RelaxVersioner.Core.Tests/RelaxVersioner.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Verify.NUnit" Version="19.13.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions RelaxVersioner.Core/RelaxVersioner.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitReader" Version="1.5.0" />
<PackageReference Include="GitReader" Version="1.7.0" />
<PackageReference Include="NamingFormatter" Version="2.3.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
Include="RelaxVersioner" Version="3.2.40" PrivateAssets="all" />
Include="RelaxVersioner" Version="3.2.60" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion RelaxVersioner.Tasks/RelaxVersioner.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
Include="RelaxVersioner" Version="3.2.40" PrivateAssets="all" />
Include="RelaxVersioner" Version="3.2.60" PrivateAssets="all" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion RelaxVersioner/RelaxVersioner.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
Include="RelaxVersioner" Version="3.2.40" PrivateAssets="all" />
Include="RelaxVersioner" Version="3.2.60" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 747aa5d

Please sign in to comment.