Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use .NET9 #11

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Use .NET9 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.x'

# Add NuGet Sources

Expand Down
9 changes: 5 additions & 4 deletions src/filter-value/Filter.Value.Test/Filter.Value.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859;xUnit1044</NoWarn>
<RootNamespace>GarageGroup.Infra.Dataverse.Api.Filter.Value.Test</RootNamespace>
<AssemblyName>GarageGroup.Infra.Dataverse.Api.Filter.Value.Test</AssemblyName>
</PropertyGroup>
Expand All @@ -18,10 +19,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
5 changes: 3 additions & 2 deletions src/filter-value/Filter.Value/Filter.Value.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Infra</RootNamespace>
<AssemblyName>GarageGroup.Infra.Dataverse.Api.Filter.Value</AssemblyName>
<Version>0.2.1</Version>
<Version>0.2.2</Version>
</PropertyGroup>

</Project>
9 changes: 5 additions & 4 deletions src/filter/Filter.Test/Filter.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859;xUnit1044</NoWarn>
<RootNamespace>GarageGroup.Infra.Dataverse.Api.Filter.Test</RootNamespace>
<AssemblyName>GarageGroup.Infra.Dataverse.Api.Filter.Test</AssemblyName>
</PropertyGroup>
Expand All @@ -18,10 +19,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.1.0" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 1 addition & 3 deletions src/filter/Filter.Test/Test.Filter.Base/DataverseFilterBaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
namespace GarageGroup.Infra.Dataverse.Api.Filter.Test;

public static partial class DataverseFilterBaseTest
{
}
public static partial class DataverseFilterBaseTest;
89 changes: 48 additions & 41 deletions src/filter/Filter.Test/Test.Filter.Logical/DataverseLogicalFilterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,89 +18,96 @@ public static TheoryData<DataverseLogicalFilter, string> QueryTestData
{
new(
DataverseLogicalOperator.And,
new IDataverseFilter[]
{
[
new StubDataverseFilter(string.Empty),
new StubDataverseFilter(TestData.WhiteSpaceString)
}),
]),
string.Empty
},
{
new(
DataverseLogicalOperator.And,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.And)
{
Filters =
[
new StubDataverseFilter("Some query")
}),
]
},
"Some query"
},
{
new(
DataverseLogicalOperator.And,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.And)
{
Filters =
[
new StubDataverseFilter(string.Empty),
new StubDataverseFilter("Some query"),
new StubDataverseFilter(TestData.WhiteSpaceString)
}),
]
},
"(Some query)"
},
{
new(
DataverseLogicalOperator.And,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.And)
{
Filters =
[
new StubDataverseFilter("Some query1"),
new StubDataverseFilter("Query2"),
new StubDataverseFilter("Query3")
}),
]
},
"(Some query1 and Query2 and Query3)"
},
{
new(
DataverseLogicalOperator.Or,
default),
new(DataverseLogicalOperator.Or)
{
Filters = default
},
string.Empty
},
{
new(
DataverseLogicalOperator.Or,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.Or)
{
Filters =
[
new StubDataverseFilter(TestData.MixedWhiteSpacesString),
new StubDataverseFilter(TestData.TabString)
}),
]
},
string.Empty
},
{
new(
DataverseLogicalOperator.Or,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.Or)
{
Filters =
[
new StubDataverseFilter("Some query")
}),
]
},
"Some query"
},
{
new(
DataverseLogicalOperator.Or,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.Or)
{
Filters =
[
new StubDataverseFilter(TestData.WhiteSpaceString),
new StubDataverseFilter("Some query"),
new StubDataverseFilter(null!)
}),
]
},
"(Some query)"
},
{
new(
DataverseLogicalOperator.Or,
new IDataverseFilter[]
{
new(DataverseLogicalOperator.Or)
{
Filters =
[
new StubDataverseFilter("Some query1"),
new StubDataverseFilter("Query2"),
new StubDataverseFilter("Query3")
}),
]
},
"(Some query1 or Query2 or Query3)"
}
};
Expand Down
20 changes: 8 additions & 12 deletions src/filter/Filter.Test/Test.Filter.Set/DataverseSetFilterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,20 @@ public static TheoryData<DataverseSetFilter, string> QueryTestData
new(
"Some Field",
DataverseSetOperator.In,
new[]
{
[
DataverseFilterValue.FromRawString("Some value")
}),
]),
"Some+Field eq Some value"
},
{
new(
"SomeField",
DataverseSetOperator.In,
new[]
{
[
DataverseFilterValue.FromRawString("One"),
DataverseFilterValue.FromRawString("Two"),
DataverseFilterValue.FromRawString("Three")
}),
]),
"(SomeField eq One or SomeField eq Two or SomeField eq Three)"
},
{
Expand All @@ -48,22 +46,20 @@ public static TheoryData<DataverseSetFilter, string> QueryTestData
new(
"SomeField",
DataverseSetOperator.NotIn,
new[]
{
[
DataverseFilterValue.FromRawString("Some value")
}),
]),
"SomeField ne Some value"
},
{
new(
"Some'Field",
DataverseSetOperator.NotIn,
new[]
{
[
DataverseFilterValue.FromRawString("One"),
DataverseFilterValue.FromRawString("Two"),
DataverseFilterValue.FromRawString("Three")
}),
]),
"(Some%27Field ne One and Some%27Field ne Two and Some%27Field ne Three)"
}
};
Expand Down
9 changes: 5 additions & 4 deletions src/filter/Filter/Filter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Infra</RootNamespace>
<AssemblyName>GarageGroup.Infra.Dataverse.Api.Filter</AssemblyName>
<Version>0.4.0</Version>
<Version>0.5.0</Version>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Filter.Value" Version="0.2.1" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.4.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Filter.Value" Version="0.2.2" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.5.0" />
</ItemGroup>

</Project>
4 changes: 1 addition & 3 deletions src/filter/Filter/Internal.Helper/DataverseFilterHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
namespace GarageGroup.Infra;

internal static partial class DataverseFilterHelper
{
}
internal static partial class DataverseFilterHelper;