Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit 51b8827

Browse files
IharYakimushIharYakimush
authored
Merge pull request #48 from IharYakimush/workflow
Workflow
2 parents de77b7f + 6465b1c commit 51b8827

File tree

8 files changed

+53
-51
lines changed

8 files changed

+53
-51
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: .NET
22

33
on:
44
push:
5-
branches: [ develop ]
5+
branches: [ develop, master ]
66
pull_request:
77
branches: [ develop ]
88

@@ -35,3 +35,29 @@ jobs:
3535
run: dotnet build --no-restore --configuration Debug
3636
- name: Test 3.1
3737
run: dotnet test Community.Data.OData.Linq.xTests --no-build --verbosity normal --configuration Debug
38+
nuget:
39+
runs-on: ubuntu-latest
40+
if: ${{ github.event_name != 'pull_request' }}
41+
needs: build
42+
steps:
43+
- uses: actions/checkout@v3
44+
- name: Setup net6.0
45+
uses: actions/setup-dotnet@v2
46+
with:
47+
dotnet-version: 6.0.x
48+
- name: Restore dependencies
49+
run: dotnet restore
50+
- name: Build
51+
run: dotnet build --no-restore --configuration Release
52+
- name: Pack Rc
53+
run: dotnet pack -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:VersionPrefix=${{ github.run_number }}-rc -o .\nupkgrc
54+
if: github.ref == 'refs/heads/develop'
55+
- name: Pack
56+
run: dotnet pack -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:VersionPrefix=${{ github.run_number }} -o .\nupkg
57+
if: github.ref == 'refs/heads/master'
58+
- name: Push Rc
59+
run: dotnet nuget push /nupkgrc/*.nupkg --api-key ${{ secrets.ODATA_NUGET_KEY }}
60+
if: github.ref == 'refs/heads/develop'
61+
- name: Push
62+
run: dotnet nuget push /nupkg/*.nupkg --api-key ${{ secrets.ODATA_NUGET_KEY }}
63+
if: github.ref == 'refs/heads/master'

‎Community.Data.OData.Linq.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9CBF15A2-B552-47EB-B2A1-475E4B05A4CA}"
1111
ProjectSection(SolutionItems) = preProject
1212
build.ps1 = build.ps1
13+
Directory.Build.props = Directory.Build.props
1314
docker-compose.yml = docker-compose.yml
1415
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
1516
LICENSE = LICENSE

‎Community.Data.OData.Linq/Community.OData.Linq.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,10 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>sgn.snk</AssemblyOriginatorKeyFile>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
9-
<Authors>IharYakimush</Authors>
10-
<PackageLicenseUrl></PackageLicenseUrl>
11-
<PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
12-
<RepositoryType></RepositoryType>
137
<PackageTags>odata filter linq netstandard</PackageTags>
148
<PackageReleaseNotes>Significant improvement in query initialization performance. Support ToArrayAsync(), ToListAsync(), and all other provider specific methods. More integration tests for Entity Framework and CosmosDb SQL API. Breaking Changes: net4.5 not suported anymore. Obsolete methods removed (.SelectExpandJsonToken() and .SelectExpandJson()). Setting for default timezone in case of converting DateTimeOffset to DateTime</PackageReleaseNotes>
159
<Description>Use OData filter text query in linq expresson for any IQuerable without ASP.NET dependency. Support netstandard2.0</Description>
16-
<Company />
17-
<RepositoryUrl></RepositoryUrl>
18-
<Version>2.1.0</Version>
19-
<NeutralLanguage>en</NeutralLanguage>
20-
<AssemblyVersion>2.1.0.0</AssemblyVersion>
21-
<FileVersion>2.1.0.0</FileVersion>
22-
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<IsPackable>true</IsPackable>
2411
</PropertyGroup>
2512

2613
<ItemGroup>

‎Community.OData.Linq.AspNetCore/Community.OData.Linq.AspNetCore.csproj‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<SignAssembly>true</SignAssembly>
6-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
8-
<AssemblyOriginatorKeyFile>sgn.snk</AssemblyOriginatorKeyFile>
9-
<Authors>IharYakimush</Authors>
10-
<PackageLicenseUrl></PackageLicenseUrl>
11-
<PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
6+
<AssemblyOriginatorKeyFile>sgn.snk</AssemblyOriginatorKeyFile>
127
<PackageTags>odata linq aspnetcore</PackageTags>
13-
<Description>OData linq for ASP.NET Core 2.0+</Description>
14-
<PackageReleaseNotes>Significant improvement in query initialization performance. Support ToArrayAsync(), ToListAsync(), and all other provider specific methods. More integration tests for Entity Framework and CosmosDb SQL API. Breaking Changes: net4.5 not suported anymore. Obsolete methods removed (.SelectExpandJsonToken() and .SelectExpandJson()). Setting for default timezone in case of converting DateTimeOffset to DateTime</PackageReleaseNotes>
15-
<Company />
16-
<RepositoryUrl></RepositoryUrl>
17-
<Version>2.1.0</Version>
18-
<NeutralLanguage>en</NeutralLanguage>
19-
<AssemblyVersion>2.1.0.0</AssemblyVersion>
20-
<FileVersion>2.1.0.0</FileVersion>
21-
<PackageReadmeFile>README.md</PackageReadmeFile>
22-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8+
<PackageReleaseNotes>Significant improvement in query initialization performance. Support ToArrayAsync(), ToListAsync(), and all other provider specific methods. More integration tests for Entity Framework and CosmosDb SQL API. Breaking Changes: net4.5 not suported anymore. Obsolete methods removed (.SelectExpandJsonToken() and .SelectExpandJson()). Setting for default timezone in case of converting DateTimeOffset to DateTime</PackageReleaseNotes>
9+
<Description>OData linq for ASP.NET Core 2.0+</Description>
10+
<IsPackable>true</IsPackable>
2311
</PropertyGroup>
2412

2513
<ItemGroup>

‎Community.OData.Linq.Json/Community.OData.Linq.Json.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,10 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>sgn.snk</AssemblyOriginatorKeyFile>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
9-
<Authors>IharYakimush</Authors>
10-
<PackageLicenseUrl></PackageLicenseUrl>
11-
<PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
12-
<RepositoryType></RepositoryType>
137
<PackageTags>odata filter linq json</PackageTags>
148
<PackageReleaseNotes>Significant improvement in query initialization performance. Support ToArrayAsync(), ToListAsync(), and all other provider specific methods. More integration tests for Entity Framework and CosmosDb SQL API. Breaking Changes: net4.5 not suported anymore. Obsolete methods removed (.SelectExpandJsonToken() and .SelectExpandJson()). Setting for default timezone in case of converting DateTimeOffset to DateTime</PackageReleaseNotes>
159
<Description>Json serialization for SelectExpand result</Description>
16-
<Company />
17-
<RepositoryUrl></RepositoryUrl>
18-
<Version>2.1.0</Version>
19-
<NeutralLanguage>en</NeutralLanguage>
20-
<AssemblyVersion>2.1.0.0</AssemblyVersion>
21-
<FileVersion>2.1.0.0</FileVersion>
22-
<PackageReadmeFile>README.md</PackageReadmeFile>
23-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<IsPackable>true</IsPackable>
2411
</PropertyGroup>
2512

2613
<ItemGroup>

‎Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix>0</VersionPrefix>
4+
<Version>2.1.$(VersionPrefix)</Version>
5+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
6+
<NeutralLanguage>en</NeutralLanguage>
7+
<PackageReadmeFile>README.md</PackageReadmeFile>
8+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9+
<PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
10+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
11+
<Authors>IharYakimush</Authors>
12+
<IsPackable>false</IsPackable>
13+
</PropertyGroup>
14+
</Project>
15+

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dotnet restore .\Community.Data.OData.Linq.sln
2-
dotnet build .\Community.Data.OData.Linq.sln -c Release
1+
dotnet restore
2+
dotnet build -c Release

‎pack.ps1‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
dotnet build -c Release
2-
dotnet pack .\Community.Data.OData.Linq\Community.OData.Linq.csproj -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -o .\nupkg
3-
dotnet pack .\Community.OData.Linq.Json\Community.OData.Linq.Json.csproj -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -o .\nupkg
4-
dotnet pack .\Community.OData.Linq.AspNetCore\Community.OData.Linq.AspNetCore.csproj -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -o .\nupkg
1+
Remove-Item -Path .\nupkg -ErrorAction SilentlyContinue -Recurse
2+
dotnet pack -c Release -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:VersionPrefix=0-local -o .\nupkg

0 commit comments

Comments
 (0)