From 87f7b8d54c804e569140833af38847ec897855a0 Mon Sep 17 00:00:00 2001 From: Ebere Abanonu Date: Tue, 14 Nov 2023 22:41:47 +0100 Subject: [PATCH 1/4] Added NET8.0 --- AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj | 2 +- SchemaGenerator/AvroSchemaGenerator.csproj | 2 +- global.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj b/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj index bd833c4..a8b7140 100644 --- a/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj +++ b/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj @@ -1,7 +1,7 @@  - net7.0 + net7.0;net8.0 false diff --git a/SchemaGenerator/AvroSchemaGenerator.csproj b/SchemaGenerator/AvroSchemaGenerator.csproj index 13c4a27..c1a2ef2 100644 --- a/SchemaGenerator/AvroSchemaGenerator.csproj +++ b/SchemaGenerator/AvroSchemaGenerator.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net7.0 + netstandard2.0;net7.0;net8.0 https://github.com/eaba/SchemaGenerator https://github.com/eaba/SchemaGenerator README.md diff --git a/global.json b/global.json index fafdff9..989a69c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.101", + "version": "8.0.100", "rollForward": "latestMinor" } } \ No newline at end of file From 4861b814e32a8a6b84987fd213a207d70b9d7384 Mon Sep 17 00:00:00 2001 From: Ebere Abanonu Date: Sat, 16 Dec 2023 15:06:11 +0100 Subject: [PATCH 2/4] Updates --- build.cmd | 2 +- build.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.cmd b/build.cmd index 8b8b89d..b08cc59 100755 --- a/build.cmd +++ b/build.cmd @@ -4,4 +4,4 @@ :; exit $? @ECHO OFF -powershell -ExecutionPolicy ByPass -NoProfile "%~dp0build.ps1" %* +powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %* diff --git a/build.sh b/build.sh index e8961f9..d4a7e51 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp" DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json" DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh" -DOTNET_CHANNEL="Current" +DOTNET_CHANNEL="STS" export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -56,7 +56,12 @@ else export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet" fi -echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)" +echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)" + +if [[ ! -z ${NUKE_ENTERPRISE_TOKEN+x} && "NUKE_ENTERPRISE_TOKEN" != "" ]]; then + "$DOTNET_EXE" nuget remove source "nuke-enterprise" &>/dev/null || true + "$DOTNET_EXE" nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password "$NUKE_ENTERPRISE_TOKEN" --store-password-in-clear-text &>/dev/null || true +fi "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet "$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@" From 26e8eac47eaa0ddab71d3b05e7cce9971d3b648b Mon Sep 17 00:00:00 2001 From: Ebere Abanonu Date: Sat, 16 Dec 2023 15:17:13 +0100 Subject: [PATCH 3/4] Update GitVersion.Tool v5.12.0 Added `CODE_OF_CONDUCT`` --- .../AvroSchemaGenerator.Tests.csproj | 10 +++++----- CODE_OF_CONDUCT.md | 5 +++++ SchemaGenerator/AvroSchemaGenerator.csproj | 2 +- build.ps1 | 13 +++++++++---- build/_build.csproj | 4 ++-- global.json | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 CODE_OF_CONDUCT.md diff --git a/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj b/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj index a8b7140..9157db6 100644 --- a/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj +++ b/AvroSchemaGenerator.Tests/AvroSchemaGenerator.Tests.csproj @@ -7,14 +7,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..68add25 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,5 @@ +# Code of Conduct + +This project has adopted the code of conduct defined by the Contributor Covenant +to clarify expected behavior in our community. +For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). \ No newline at end of file diff --git a/SchemaGenerator/AvroSchemaGenerator.csproj b/SchemaGenerator/AvroSchemaGenerator.csproj index c1a2ef2..b33d9f4 100644 --- a/SchemaGenerator/AvroSchemaGenerator.csproj +++ b/SchemaGenerator/AvroSchemaGenerator.csproj @@ -16,7 +16,7 @@ - + diff --git a/build.ps1 b/build.ps1 index bbaa118..c0c0e61 100644 --- a/build.ps1 +++ b/build.ps1 @@ -18,7 +18,7 @@ $TempDirectory = "$PSScriptRoot\\.nuke\temp" $DotNetGlobalFile = "$PSScriptRoot\\global.json" $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1" -$DotNetChannel = "Current" +$DotNetChannel = "STS" $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1 @@ -56,14 +56,19 @@ else { # Install by channel or version $DotNetDirectory = "$TempDirectory\dotnet-win" if (!(Test-Path variable:DotNetVersion)) { - ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath } + ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath } } else { - ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath } + ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath } } $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe" } -Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)" +Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)" + +if (Test-Path env:NUKE_ENTERPRISE_TOKEN) { + & $env:DOTNET_EXE nuget remove source "nuke-enterprise" > $null + & $env:DOTNET_EXE nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password $env:NUKE_ENTERPRISE_TOKEN > $null +} ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet } ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments } diff --git a/build/_build.csproj b/build/_build.csproj index fbc6d80..55e84bb 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/global.json b/global.json index 989a69c..c19a2e0 100644 --- a/global.json +++ b/global.json @@ -3,4 +3,4 @@ "version": "8.0.100", "rollForward": "latestMinor" } -} \ No newline at end of file +} From 7110915f8b0145a9f2d350fb4fdb0e90fdcd967c Mon Sep 17 00:00:00 2001 From: Ebere Abanonu Date: Sat, 16 Dec 2023 15:30:06 +0100 Subject: [PATCH 4/4] Added `dotnet-version 8` --- .github/workflows/Build.yml | 6 ++++++ .github/workflows/Release.yml | 3 +++ .github/workflows/Tests.yml | 6 ++++++ build/Build.CI.GitHubActions.cs | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index a1f9539..ce91b3e 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -42,6 +42,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.* - uses: actions/setup-dotnet@v1 with: dotnet-version: 7.0.* @@ -63,6 +66,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.* - uses: actions/setup-dotnet@v1 with: dotnet-version: 7.0.* diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index b983861..1da9142 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -29,6 +29,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.* - uses: actions/setup-dotnet@v1 with: dotnet-version: 7.0.* diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index c4b5a64..a6e38c5 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -34,6 +34,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.* - uses: actions/setup-dotnet@v1 with: dotnet-version: 7.0.* @@ -55,6 +58,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.0.* - uses: actions/setup-dotnet@v1 with: dotnet-version: 7.0.* diff --git a/build/Build.CI.GitHubActions.cs b/build/Build.CI.GitHubActions.cs index 93b8184..0435878 100644 --- a/build/Build.CI.GitHubActions.cs +++ b/build/Build.CI.GitHubActions.cs @@ -61,7 +61,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC try { var newSteps = new List(job.Steps); - foreach (var version in new[] { "7.0.*" }) + foreach (var version in new[] { "7.0.*", "8.0.*" }) { newSteps.Insert(1, new GitHubActionsSetupDotNetStep {