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

Feature/net8 remove newtonsoft #77

Merged
merged 34 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
772eb11
use streaming deserialize
st0o0 Jul 15, 2023
80674c5
code cleanup
st0o0 Jul 15, 2023
01bda9d
update
st0o0 Jul 16, 2023
eb427cc
remove unused usings
st0o0 Aug 12, 2023
5203888
–FlickrConvert: changed to System.Text.JSON
LineOfC0d3 Aug 24, 2023
9782a63
fixed not working: WithAddedModifier, updated references
LineOfC0d3 Aug 24, 2023
acf2701
FlickrConvert: getting DeclaringType using reflection
LineOfC0d3 Aug 24, 2023
285897b
added IdentifierConverters
LineOfC0d3 Aug 24, 2023
9112db7
Add dotnet preview in devcontainer
st0o0 Aug 25, 2023
222a448
FlickrConvert: fixed properties not being assigned
LineOfC0d3 Aug 25, 2023
6492839
changed JsonProperty to JsonPropertyName
LineOfC0d3 Aug 25, 2023
20a0911
updated converters
LineOfC0d3 Aug 25, 2023
adbe1b1
FlickrResult: replaced JToken with JsonElement
LineOfC0d3 Aug 25, 2023
b462a84
added CustomJsonStringEnumConverter
LineOfC0d3 Aug 25, 2023
38efbd7
removed GenericJsonPropertyNameContractResolver
LineOfC0d3 Aug 25, 2023
657913f
update devcontainer.json
st0o0 Aug 25, 2023
de99c74
update devcontainer
st0o0 Aug 26, 2023
f98a1b6
revert update devcontainer
st0o0 Aug 26, 2023
fecf3de
idk
st0o0 Aug 26, 2023
82b634c
KEKW @st0o0
st0o0 Aug 26, 2023
9ec1a75
Update devcontainer.json
st0o0 Aug 26, 2023
6c684da
Update devcontainer.json
st0o0 Aug 26, 2023
2713ecb
update
st0o0 Aug 26, 2023
fe0050c
update
st0o0 Aug 26, 2023
9b84f6d
it's working again 💌
st0o0 Aug 26, 2023
a89c945
little fix and improvements
st0o0 Aug 26, 2023
b5446c1
refactor and update
st0o0 Aug 26, 2023
d4fabac
update dotnet sdk version
st0o0 Aug 26, 2023
77ada4d
fix pipeline
st0o0 Nov 23, 2023
987dc54
update IncludePreview to false
st0o0 Nov 23, 2023
0f1131c
litte cleanup
st0o0 Nov 23, 2023
c0402a7
code cleanup
st0o0 Nov 23, 2023
10cabfb
fix naming
st0o0 Nov 23, 2023
e40e73f
update nuget dependencies
st0o0 Nov 23, 2023
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
76 changes: 37 additions & 39 deletions .azure-pipelines/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
trigger:
branches:
exclude:
- master
- gh-pages
paths:
exclude:
- '.github'
- ".github"
- docs
- README.md
- CHANGELOG.md
Expand Down Expand Up @@ -39,48 +38,49 @@ stages:
inputs:
packageType: sdk
version: $(netSdkVersion)
includePreviewVersions: $(netIncludePreview)

- task: DotNetCoreCLI@2
displayName: 'Restore NuGet dependencies'
displayName: "Restore NuGet dependencies"
inputs:
command: 'restore'
projects: '$(projectPath)'
feedsToUse: 'select'
command: "restore"
projects: "$(projectPath)"
feedsToUse: "select"
vstsFeed: $(internalFeedName)
includeNuGetOrg: true
includeNuGetOrg: true

- task: gitversion/setup@0
displayName: 'Setup git version'
displayName: "Setup git version"
inputs:
versionSpec: '5.x'
versionSpec: "5.x"

- task: gitversion/execute@0
displayName: 'Calculate git version'
displayName: "Calculate git version"
inputs:
additionalArguments: '/updateprojectfiles'
additionalArguments: "/updateprojectfiles"

- task: DotNetCoreCLI@2
displayName: 'Build projects [$(buildConfiguration)]'
displayName: "Build projects [$(buildConfiguration)]"
inputs:
command: 'build'
projects: '$(projectPath)'
arguments: '--configuration $(buildConfiguration) --no-restore'
command: "build"
projects: "$(projectPath)"
arguments: "--configuration $(buildConfiguration) --no-restore"
versioningScheme: byEnvVar
versionEnvVar: 'GitVersion.SemVer'
versionEnvVar: "GitVersion.SemVer"

- task: DotNetCoreCLI@2
displayName: 'Create NuGet package'
displayName: "Create NuGet package"
inputs:
command: 'pack'
packagesToPack: '**/*.csproj;!**/*.Test.csproj'
versioningScheme: 'byEnvVar'
versionEnvVar: 'GitVersion.NuGetVersion'
command: "pack"
packagesToPack: "**/*.csproj;!**/*.Test.csproj"
versioningScheme: "byEnvVar"
versionEnvVar: "GitVersion.NuGetVersion"
packDirectory: $(Build.ArtifactStagingDirectory)/packages/
configuration: $(buildConfiguration)

- publish: $(Build.ArtifactStagingDirectory)/packages
artifact: packages

- stage: Test
dependsOn: Build
displayName: 🧪 Test
Expand All @@ -97,10 +97,10 @@ stages:
version: $(netSdkVersion)

- task: DotNetCoreCLI@2
displayName: 'Run unit tests'
displayName: "Run unit tests"
inputs:
command: 'test'
projects: '**/*.@(Test|Tests).csproj'
command: "test"
projects: "**/*.@(Test|Tests).csproj"
arguments: >-
--configuration $(buildConfiguration)
--collect:"XPlat Code Coverage"
Expand All @@ -109,7 +109,7 @@ stages:
publishTestResults: true

- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage'
displayName: "Publish code coverage"
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: $(Agent.TempDirectory)/*/coverage.cobertura.xml
Expand All @@ -123,24 +123,22 @@ stages:
pool:
vmImage: $(vmImage)
steps:
- checkout: none
- checkout: self
fetchDepth: 0
persistCredentials: true
- download: current
artifact: packages
- task: UseDotNet@2
displayName: Install .NET sdk
inputs:
packageType: sdk
version: $(netSdkVersion)

- task: NuGetAuthenticate@1
displayName: 'NuGet Authenticate'

- task: NuGetCommand@2
displayName: Publish CI package to Azure artifacts
displayName: Push CI Packages To Orga Feed
inputs:
command: 'push'
packagesToPush: $(Pipeline.Workspace)/packages/*.*upkg
nuGetFeedType: 'internal'
vstsFeed: $(internalFeedName)
publishVstsFeed: $(internalFeedName)
allowPackageConflicts: true
command: "push"
packagesToPush: "$(Pipeline.Workspace)/packages/*.*upkg"
nuGetFeedType: "internal"
publishVstsFeed: "df073d1b-6358-4e76-b320-21161d87d536/4089c11d-57f8-4cc1-845f-8811a243c480"
allowPackageConflicts: true
165 changes: 88 additions & 77 deletions .azure-pipelines/release-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ trigger:
- master
paths:
exclude:
- '.github'
- ".github"
- docs
- README.md
- CHANGELOG.md
Expand Down Expand Up @@ -36,46 +36,46 @@ stages:
version: $(netSdkVersion)

- task: DotNetCoreCLI@2
displayName: 'Restore NuGet dependencies'
displayName: "Restore NuGet dependencies"
inputs:
command: 'restore'
projects: '$(projectPath)'
feedsToUse: 'select'
command: "restore"
projects: "$(projectPath)"
feedsToUse: "select"
vstsFeed: $(internalFeedName)
includeNuGetOrg: true
includeNuGetOrg: true

- task: gitversion/setup@0
displayName: 'Setup git version'
displayName: "Setup git version"
inputs:
versionSpec: '5.x'
versionSpec: "5.x"

- task: gitversion/execute@0
displayName: 'Calculate git version'
displayName: "Calculate git version"
inputs:
additionalArguments: '/updateprojectfiles'
additionalArguments: "/updateprojectfiles"

- task: DotNetCoreCLI@2
displayName: 'Build projects [$(buildConfiguration)]'
displayName: "Build projects [$(buildConfiguration)]"
inputs:
command: 'build'
projects: '$(projectPath)'
arguments: '--configuration $(buildConfiguration) --no-restore'
command: "build"
projects: "$(projectPath)"
arguments: "--configuration $(buildConfiguration) --no-restore"
versioningScheme: byEnvVar
versionEnvVar: 'GitVersion.SemVer'
versionEnvVar: "GitVersion.SemVer"

- task: DotNetCoreCLI@2
displayName: 'Create NuGet package'
displayName: "Create NuGet package"
inputs:
command: 'pack'
packagesToPack: '**/*.csproj;!**/*.Test.csproj'
versioningScheme: 'byEnvVar'
versionEnvVar: 'GitVersion.NuGetVersion'
command: "pack"
packagesToPack: "**/*.csproj;!**/*.Test.csproj"
versioningScheme: "byEnvVar"
versionEnvVar: "GitVersion.NuGetVersion"
packDirectory: $(Build.ArtifactStagingDirectory)/packages/
configuration: $(buildConfiguration)

- publish: $(Build.ArtifactStagingDirectory)/packages
artifact: packages

- stage: Test
dependsOn: Build
displayName: 🧪 Test
Expand All @@ -92,10 +92,10 @@ stages:
version: $(netSdkVersion)

- task: DotNetCoreCLI@2
displayName: 'Run unit tests'
displayName: "Run unit tests"
inputs:
command: 'test'
projects: '**/*.@(Test|Tests).csproj'
command: "test"
projects: "**/*.@(Test|Tests).csproj"
arguments: >-
--configuration $(buildConfiguration)
--collect:"XPlat Code Coverage"
Expand All @@ -104,7 +104,7 @@ stages:
publishTestResults: true

- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage'
displayName: "Publish code coverage"
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: $(Agent.TempDirectory)/*/coverage.cobertura.xml
Expand All @@ -113,54 +113,65 @@ stages:
dependsOn: Build
displayName: 📤 Publish artifacts
jobs:
- deployment: 'DeployToNuget'
environment: 'NugetRelease'
displayName: Publish artifacts
pool:
- deployment: "DeployToNuget"
environment: "NugetRelease"
displayName: Publish artifacts
pool:
vmImage: $(vmImage)
strategy:
runOnce:
deploy:
steps:
- checkout: none
- download: current
artifact: packages
- task: UseDotNet@2
displayName: Install .NET sdk
inputs:
packageType: sdk
version: $(netSdkVersion)

- task: NuGetAuthenticate@1
displayName: 'NuGet Authenticate'

- task: NuGetCommand@2
displayName: Publish CI package to Azure artifacts
inputs:
command: 'push'
packagesToPush: $(Pipeline.Workspace)/packages/*.*upkg
nuGetFeedType: 'internal'
vstsFeed: $(internalFeedName)
publishVstsFeed: $(internalFeedName)
allowPackageConflicts: true
- task: NuGetCommand@2
inputs:
command: 'push'
packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
nuGetFeedType: 'external'
publishFeedCredentials: 'Nuget.org'

- task: GitHubRelease@0
displayName: Create Github Release
inputs:
action: create
target: $(Build.SourceVersion)
tagSource: manual
tag: v$(GitVersion.NuGetVersion)
tagPattern: v$(GitVersion.NuGetVersion)
title: v$(GitVersion.NuGetVersion)
githubConnection: githubRelease
repositoryName: $(Build.Repository.Name)
isPreRelease: false
addChangeLog: true
assets: $(Build.ArtifactStagingDirectory)/packages/*
strategy:
runOnce:
deploy:
steps:
- checkout: self
fetchDepth: 0
persistCredentials: true
- download: current
artifact: packages

- task: UseDotNet@2
displayName: Install .NET sdk
inputs:
packageType: sdk
version: $(netSdkVersion)

- task: gitversion/setup@0
displayName: "Setup git version"
inputs:
versionSpec: "5.x"

- task: gitversion/execute@0
displayName: "Calculate git version"
inputs:
additionalArguments: "/updateprojectfiles"

- task: NuGetCommand@2
displayName: Push CI Packages To Orga Feed
inputs:
command: "push"
packagesToPush: "$(Pipeline.Workspace)/packages/*.*upkg"
nuGetFeedType: "internal"
publishVstsFeed: "df073d1b-6358-4e76-b320-21161d87d536/4089c11d-57f8-4cc1-845f-8811a243c480"
allowPackageConflicts: true

- task: NuGetCommand@2
displayName: Push CI Packages To Nuget
inputs:
command: "push"
packagesToPush: "$(Pipeline.Workspace)/packages/*.*upkg"
nuGetFeedType: "external"
publishFeedCredentials: "nuget"

- task: GitHubRelease@0
displayName: Create Github Release
inputs:
action: create
target: $(Build.SourceVersion)
tagSource: manual
tag: $(GitVersion.NuGetVersion)
tagPattern: $(GitVersion.NuGetVersion)
title: $(GitVersion.NuGetVersion)
githubConnection: githubRelease
repositoryName: $(Build.Repository.Name)
isPreRelease: false
addChangeLog: true
assets: "$(Pipeline.Workspace)/packages/*.*upkg"
4 changes: 3 additions & 1 deletion .azure-pipelines/variables.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
variables:
- name: netSdkVersion
value: 7.0.x
value: 8.0.x
- name: netIncludePreview
value: false
- name: buildConfiguration
value: Release
- name: vmImage
Expand Down
14 changes: 13 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
{"image":"mcr.microsoft.com/devcontainers/universal:2"}
{
"name": "Flickr.Net",
"service": "devhost",
"remoteUser": "root",
"postCreateCommand": "sh ./.devcontainer/postCreateCommand.sh",
"customizations": {
"vscode": {
"extensions": [
"ms-dotnettools.csharp"
]
}
}
}
Loading