Skip to content

Commit

Permalink
Update dependencies for 2.0.1 release (#367)
Browse files Browse the repository at this point in the history
* Update to latest .NET SDK 3.4.8
* Update to .net6
* Update language version to 10
* Update test dependencies to latest
  • Loading branch information
jeffrymorris authored Jun 22, 2023
1 parent 824be58 commit 3070d9a
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 25 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core 3.1
uses: actions/setup-dotnet@v1
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '3.1.301'
- name: Setup .NET Core 5.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: '6.0.x'
- name: Install dependencies
run: dotnet restore Src/couchbase-net-linq.sln
- name: Build
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<LangVersion>9</LangVersion>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,12 +14,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="3.2.5" />
<PackageReference Include="CouchbaseNetClient" Version="3.4.8" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
Expand Down
12 changes: 6 additions & 6 deletions Src/Couchbase.Linq.UnitTests/Couchbase.Linq.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net6.0</TargetFramework>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<LangVersion>9</LangVersion>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Couchbase.Linq\Couchbase.Linq.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="3.2.5" />
<PackageReference Include="CouchbaseNetClient" Version="3.4.8" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

Expand Down
14 changes: 7 additions & 7 deletions Src/Couchbase.Linq/Couchbase.Linq.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<Title>The official Linq provider for Couchbase N1QL</Title>
<Authors>Couchbase, Inc.</Authors>
<Owners>Couchbase, Inc.</Owners>
<Copyright>Copyright 2021</Copyright>
<Description>The official Language Integrated Query (LINQ) provider for querying Couchbase Server with N1QL using the Couchbase .NET SDK 3.2 and greater.</Description>
<Copyright>Copyright 2023</Copyright>
<Description>The official Language Integrated Query (LINQ) provider for querying Couchbase Server with N1QL using the Couchbase .NET SDK 3.4 and greater.</Description>
<PackageTags>couchbase;linq;n1ql;nosql;database</PackageTags>

<PackageProjectUrl>https://github.com/couchbaselabs/Linq2Couchbase</PackageProjectUrl>
<PackageIconUrl></PackageIconUrl>

<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<RootNamespace>Couchbase.Linq</RootNamespace>
<AssemblyName>Couchbase.Linq</AssemblyName>

Expand All @@ -22,18 +22,18 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<LangVersion>9</LangVersion>
<LangVersion>10</LangVersion>
<Nullable>enable</Nullable>
<SignAssembly>false</SignAssembly>
<Version>2.0.0</Version>
<Version>2.0.1-beta.1</Version>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageIcon>couchbase.png</PackageIcon>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CouchbaseNetClient" Version="3.2.5" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PackageReference Include="CouchbaseNetClient" Version="3.4.8" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 3070d9a

Please sign in to comment.