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.

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

Move to JSON.NET 13.x #265

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ jobs:
relnotes: ${{ steps.set_proj_version.outputs.RELNOTES }}
name: Build and package
runs-on: ubuntu-latest
permissions:
contents: write
checks: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
with:
Expand All @@ -56,7 +59,7 @@ jobs:
run: dotnet pack --configuration Release -o finalpackage --no-build

- name: Publish artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nupkg
path: finalpackage
Expand All @@ -78,9 +81,12 @@ jobs:
url: https://www.nuget.org/packages/Alexa.NET/
name: Sign and publish
runs-on: windows-latest # using windows agent due to nuget can't sign on linux yet
permissions:
contents: read

steps:
- name: Download Package artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: nupkg

Expand All @@ -91,7 +97,7 @@ jobs:
nuget-version: latest

- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1.8.0
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
include-prerelease: true
Expand Down Expand Up @@ -129,7 +135,7 @@ jobs:
**/*.nupkg

- name: Publish signed artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: signednupkg
path: .
11 changes: 6 additions & 5 deletions .github/workflows/prbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: PR Build

on:
pull_request:
branches:
- master
on: [pull_request, workflow_dispatch]


jobs:
build:
name: PR build and test
runs-on: ubuntu-latest
permissions:
contents: write
checks: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ bld/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
coverage.*

# NUNIT
*.VisualState.xml
Expand Down
14 changes: 10 additions & 4 deletions Alexa.NET.Tests/Alexa.NET.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<NoWarn>CS0612,CS0618</NoWarn>
<CollectCoverage>true</CollectCoverage>
<CoverletOutputFormat>cobertura,lcov</CoverletOutputFormat>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions Alexa.NET/Alexa.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading