From 4dbbdd28951d374fed077c7a9640f1c2b2dd4ff7 Mon Sep 17 00:00:00 2001 From: Caleb Kiage <747955+calebkiage@users.noreply.github.com> Date: Mon, 15 Jan 2024 09:06:51 +0300 Subject: [PATCH 1/5] Update to .NET 8 --- src/msgraph-cli.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msgraph-cli.csproj b/src/msgraph-cli.csproj index 33e24ff6f5..d72efda78d 100644 --- a/src/msgraph-cli.csproj +++ b/src/msgraph-cli.csproj @@ -2,12 +2,12 @@ Exe - net7.0 + net8.0 Microsoft.Graph.Cli disable enable mgc - 1.1.1 + 1.2.0 From 30b4b3adefb8b177ecd7daea03ca747bb5cdd45a Mon Sep 17 00:00:00 2001 From: Caleb Kiage <747955+calebkiage@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:55:31 +0300 Subject: [PATCH 2/5] Update pipeline & package lock --- .azure-pipelines/release-cli.yaml | 16 ++++++++-------- src/packages.lock.json | 11 ++++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/release-cli.yaml b/.azure-pipelines/release-cli.yaml index 1c0361b91a..cbdf430db5 100644 --- a/.azure-pipelines/release-cli.yaml +++ b/.azure-pipelines/release-cli.yaml @@ -70,9 +70,9 @@ stages: condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true')) steps: - task: UseDotNet@2 - displayName: 'Use .NET 7' + displayName: 'Use .NET 8' inputs: - version: 7.x + version: 8.x # Restore NuGet packages (enables cache by default) - template: templates/nuget-packages.yaml @@ -114,10 +114,10 @@ stages: # maxParallel: 2 steps: - task: UseDotNet@2 - displayName: 'Use .NET 7' + displayName: 'Use .NET 8' condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true')) inputs: - version: 7.x + version: 8.x - ${{ if ne(parameters.simulate, 'true') }}: - template: templates/nuget-packages.yaml @@ -179,9 +179,9 @@ stages: condition: and(succeeded(), ne('${{ parameters.simulate }}', 'true')) steps: - task: UseDotNet@2 - displayName: 'Use .NET 7' + displayName: 'Use .NET 8' inputs: - version: 7.x + version: 8.x # Restore NuGet packages (enables cache by default) - template: templates/nuget-packages.yaml @@ -410,10 +410,10 @@ stages: # Nuget tool doesn't work with multi-stage builds - task: UseDotNet@2 - displayName: 'Use .NET 7' + displayName: 'Use .NET 8' condition: and(false, succeeded(), ne('${{ parameters.simulate }}', 'true'), eq(variables['IS_NUGET'], 'true')) inputs: - version: 7.x + version: 8.x - ${{ if ne(parameters.simulate, 'true') }}: - template: templates/nuget-packages.yaml diff --git a/src/packages.lock.json b/src/packages.lock.json index 12af9521e3..48bdde1715 100644 --- a/src/packages.lock.json +++ b/src/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net7.0": { + "net8.0": { "Microsoft.Extensions.Configuration": { "type": "Direct", "requested": "[8.0.0, )", @@ -284,6 +284,7 @@ "dependencies": { "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Diagnostics": "8.0.0", "Microsoft.Extensions.Logging": "8.0.0", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", "Microsoft.Extensions.Options": "8.0.0" @@ -827,7 +828,7 @@ "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" } }, - "net7.0/linux-x64": { + "net8.0/linux-x64": { "runtime.any.System.Collections": { "type": "Transitive", "resolved": "4.3.0", @@ -1137,7 +1138,7 @@ } } }, - "net7.0/osx-arm64": { + "net8.0/osx-arm64": { "runtime.any.System.Collections": { "type": "Transitive", "resolved": "4.3.0", @@ -1447,7 +1448,7 @@ } } }, - "net7.0/osx-x64": { + "net8.0/osx-x64": { "runtime.any.System.Collections": { "type": "Transitive", "resolved": "4.3.0", @@ -1757,7 +1758,7 @@ } } }, - "net7.0/win-x64": { + "net8.0/win-x64": { "runtime.any.System.Collections": { "type": "Transitive", "resolved": "4.3.0", From d3577f057079790fc8bc7e70b27f6e4e5a9bf2c5 Mon Sep 17 00:00:00 2001 From: Caleb Kiage <747955+calebkiage@users.noreply.github.com> Date: Thu, 18 Jan 2024 12:42:04 +0300 Subject: [PATCH 3/5] Update graph cli core library --- src/msgraph-cli.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msgraph-cli.csproj b/src/msgraph-cli.csproj index d72efda78d..926f834fe2 100644 --- a/src/msgraph-cli.csproj +++ b/src/msgraph-cli.csproj @@ -57,7 +57,7 @@ - + From 6caa561b2de23391d7ee37e718b9d0f6385b8333 Mon Sep 17 00:00:00 2001 From: Caleb Kiage <747955+calebkiage@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:05:01 +0300 Subject: [PATCH 4/5] Update package.lock.json file --- src/packages.lock.json | 110 ++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/packages.lock.json b/src/packages.lock.json index 48bdde1715..5b56dfeb08 100644 --- a/src/packages.lock.json +++ b/src/packages.lock.json @@ -41,17 +41,17 @@ }, "Microsoft.Graph.Cli.Core": { "type": "Direct", - "requested": "[1.0.0, )", - "resolved": "1.0.0", - "contentHash": "DkgstotaNklu8ApCZmD7zbgFNyW1SjnvyidDjzv5ZmmqYUTs0Khuf/cvKgZDUhYALqfB5KxcrCPISkMqFyKn9w==", + "requested": "[1.1.0, )", + "resolved": "1.1.0", + "contentHash": "VrH8RwpL4bX8JDN5g+B5H7WG0bQHoy/XZMxHCi5tsU3PnN9GQaCBimXmrhgZqTPtUQc1FN0RWcihRBsGP9LfHA==", "dependencies": { "Azure.Identity": "1.10.4", - "JmesPath.Net": "1.0.308", + "JmesPath.Net": "1.0.330", "Microsoft.Extensions.Hosting": "8.0.0", "Microsoft.Extensions.Http": "8.0.0", - "Microsoft.Graph.Core": "3.1.2", - "Microsoft.Kiota.Cli.Commons": "1.0.0", - "Microsoft.Kiota.Http.HttpClientLibrary": "1.3.3", + "Microsoft.Graph.Core": "3.1.5", + "Microsoft.Kiota.Cli.Commons": "1.1.0", + "Microsoft.Kiota.Http.HttpClientLibrary": "1.3.4", "Spectre.Console": "0.48.0", "System.CommandLine": "2.0.0-beta4.22272.1" } @@ -97,10 +97,10 @@ }, "JmesPath.Net": { "type": "Transitive", - "resolved": "1.0.308", - "contentHash": "7SMRDN5bhxNnF68lyYD6QEUKQFe9lH1mIU89cyuKWAsYhbOYkZs6ckcelvaAbb89ktR4AOL/5BlxYW03LXGh7g==", + "resolved": "1.0.330", + "contentHash": "anNXUc+uSR8XpiBVVz+VbSavF9A2v5dLhIYj+sV4jT8+EKODKMgA+zy9DEgl6mk3pk6YJslXh+0/LYqGAH8lnw==", "dependencies": { - "JmesPath.Net.Parser": "1.0.308", + "JmesPath.Net.Parser": "1.0.330", "NETStandard.Library": "1.6.1", "Newtonsoft.Json": "13.0.1", "System.Reflection.TypeExtensions": "4.7.0", @@ -109,8 +109,8 @@ }, "JmesPath.Net.Parser": { "type": "Transitive", - "resolved": "1.0.308", - "contentHash": "vAdtbGA3njzBZ81f0UzddiiZEsDo+5epWXDEU+wZGv/pvBVyuiNNK39UwyzCJP3yo/TQk9G9AeWRJIbjwjKfAQ==", + "resolved": "1.0.330", + "contentHash": "DbwTbzjJpsH+b/hmP/6pSBG9hmobD+iwT80J4DBsDWpJesFRmIiqDC5hYo9+OqnaIYsYGN5PEdxILDtKUvumWA==", "dependencies": { "NETStandard.Library": "1.6.1", "Springcomp.GPLEX.Runtime": "1.2.4", @@ -386,13 +386,13 @@ }, "Microsoft.Graph.Core": { "type": "Transitive", - "resolved": "3.1.2", - "contentHash": "r+8fbhwGbfelqS3ZbFkESC+B6Lwn21gv88oXtUtRLkwFkJRmtFiCZVyuom7JaHn3cP7AUw5QNyWP6PaoqsoKEQ==", + "resolved": "3.1.5", + "contentHash": "rqAnJvO+yI/SsJKlW2XxNtHofs9DvR4EYPs+b1vx5rxEGZ8MnaMgzpeffgjjLzWZzhoqzfKzyzo0dvC8l6SD2Q==", "dependencies": { - "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.0.3", - "Microsoft.Kiota.Abstractions": "1.7.2", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.2.0", + "Microsoft.Kiota.Abstractions": "1.7.5", "Microsoft.Kiota.Authentication.Azure": "1.1.2", - "Microsoft.Kiota.Http.HttpClientLibrary": "1.3.2", + "Microsoft.Kiota.Http.HttpClientLibrary": "1.3.4", "Microsoft.Kiota.Serialization.Form": "1.1.1", "Microsoft.Kiota.Serialization.Json": "1.1.2", "Microsoft.Kiota.Serialization.Multipart": "1.1.1", @@ -421,57 +421,57 @@ }, "Microsoft.IdentityModel.Abstractions": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "cfPUWdjigLIRIJSKz3uaZxShgf86RVDXHC1VEEchj1gnY25akwPYpbrfSoIGDCqA9UmOMdlctq411+2pAViFow==" + "resolved": "7.2.0", + "contentHash": "7YgmrhCORuOP8miZJLdQhSEzyHdD5PfRjaqINbqSzS9LKEfOoHq8S9o4FVmK9Mu7Gts8MfL46sshwCk4AgjNyw==" }, "Microsoft.IdentityModel.JsonWebTokens": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "vxjHVZbMKD3rVdbvKhzAW+7UiFrYToUVm3AGmYfKSOAwyhdLl/ELX1KZr+FaLyyS5VReIzWRWJfbOuHM9i6ywg==", + "resolved": "7.2.0", + "contentHash": "zLFA9IBxDWw6Y1nz2PPZyQvF+ZZ4aW1pwgtwusQB39lgxOc2xVqZ8gitsuT1rwyuIbchGOWbax4fsJ8OgGRxSQ==", "dependencies": { - "Microsoft.IdentityModel.Tokens": "7.0.3" + "Microsoft.IdentityModel.Tokens": "7.2.0" } }, "Microsoft.IdentityModel.Logging": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "b6GbGO+2LOTBEccHhqoJsOsmemG4A/MY+8H0wK/ewRhiG+DCYwEnucog1cSArPIY55zcn+XdZl0YEiUHkpDISQ==", + "resolved": "7.2.0", + "contentHash": "U15cZGq0JfkFXKDaDalq75WKGJniZnV0D6tCbaqc/NgLpIIO/Sq56PGr1v9fhPmXW2xb6ParGFfZkfryewmpWQ==", "dependencies": { - "Microsoft.IdentityModel.Abstractions": "7.0.3" + "Microsoft.IdentityModel.Abstractions": "7.2.0" } }, "Microsoft.IdentityModel.Protocols": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "BtwR+tctBYhPNygyZmt1Rnw74GFrJteW+1zcdIgyvBCjkek6cNwPPqRfdhzCv61i+lwyNomRi8+iI4QKd4YCKA==", + "resolved": "7.2.0", + "contentHash": "V0shZekRJDwoOjqeg79M2I/Mg+PXq2DWGVymW6h2CbWOwxqHItHF3QH9Tex8cKUSEY+4/NWDUvP5c48um2xNvw==", "dependencies": { - "Microsoft.IdentityModel.Logging": "7.0.3", - "Microsoft.IdentityModel.Tokens": "7.0.3" + "Microsoft.IdentityModel.Logging": "7.2.0", + "Microsoft.IdentityModel.Tokens": "7.2.0" } }, "Microsoft.IdentityModel.Protocols.OpenIdConnect": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "W97TraHApDNArLwpPcXfD+FZH7njJsfEwZE9y9BoofeXMS8H0LBBobz0VOmYmMK4mLdOKxzN7SFT3Ekg0FWI3Q==", + "resolved": "7.2.0", + "contentHash": "d8Hm3B99rNh+RX41On0iN1PsFgDmydIjCJjYQVOwpZotQx9ItheTmYMt0m+f/9xqB4k36o5OyCKLNQUyLvV+ng==", "dependencies": { - "Microsoft.IdentityModel.Protocols": "7.0.3", - "System.IdentityModel.Tokens.Jwt": "7.0.3" + "Microsoft.IdentityModel.Protocols": "7.2.0", + "System.IdentityModel.Tokens.Jwt": "7.2.0" } }, "Microsoft.IdentityModel.Tokens": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "wB+LlbDjhnJ98DULjmFepqf9eEMh/sDs6S6hFh68iNRHmwollwhxk+nbSSfpA5+j+FbRyNskoaY4JsY1iCOKCg==", + "resolved": "7.2.0", + "contentHash": "ycDxTRKNG2ad+y8166YuE0vqbzONEcgoZhMeOfqOoC4GDNOGEYlMoSS+Qm6n/GBHgW6FNmNxpXOUJLRMbJxcWQ==", "dependencies": { - "Microsoft.IdentityModel.Logging": "7.0.3" + "Microsoft.IdentityModel.Logging": "7.2.0" } }, "Microsoft.Kiota.Abstractions": { "type": "Transitive", - "resolved": "1.7.2", - "contentHash": "7ZxIrX23NZXqmYZyUCmjtDYnY6Wc9pkKWsItIxxSQ5Obea4xqX0AGRInxP8tsV5Z5t67RkVcM1O2zATRDJh1fA==", + "resolved": "1.7.5", + "contentHash": "6oAk4nq/lnyPOmILshB8P6w9Q2X5H4Z7hGBT+Lbuusr+FnxzO6gb7BY50KY7+buiirCi4U90juk6WcXiY7SN3w==", "dependencies": { - "Std.UriTemplate": "0.0.46", + "Std.UriTemplate": "0.0.50", "System.Diagnostics.DiagnosticSource": "[6.0.0, 9.0.0)" } }, @@ -487,23 +487,23 @@ }, "Microsoft.Kiota.Cli.Commons": { "type": "Transitive", - "resolved": "1.0.0", - "contentHash": "Vcf303kY8TBIytTtPFzvUaf5SLLKlJ2RyccL6SJacdVt8WHlUAYp1UuP7+vGNN98Jb0hdj2stBelpxXSAmHeug==", + "resolved": "1.1.0", + "contentHash": "TTzb2bpl6svk8Bovm/9IMEvBCPyNbvHSB6stYR4hgE6eiXxZvjRdHaSzdMNKEC7KW4hnMi/1MhHS1PtJWqqyvA==", "dependencies": { - "JmesPath.Net": "1.0.308", + "JmesPath.Net": "1.0.330", "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Kiota.Abstractions": "1.7.2", + "Microsoft.Kiota.Abstractions": "1.7.5", "Spectre.Console": "0.48.0", "System.CommandLine": "2.0.0-beta4.22272.1", - "System.Text.Json": "7.0.3" + "System.Text.Json": "8.0.1" } }, "Microsoft.Kiota.Http.HttpClientLibrary": { "type": "Transitive", - "resolved": "1.3.3", - "contentHash": "X+rkl///PgQawQyQGNtZHoY2rhcOc6BngOwK75098HUViJr1IuLc06k5Rq2eRPN0rdngWWyHwM5wC/96V04geQ==", + "resolved": "1.3.4", + "contentHash": "UDIdHI97FL6aJFEEqI3UL0R8JzYnu0wRtP0UwfKMcldLA3JF1p8lhocn0yll5ZUb2cxpmFOVxX6kJiHEh+8V1w==", "dependencies": { - "Microsoft.Kiota.Abstractions": "1.7.2", + "Microsoft.Kiota.Abstractions": "1.7.3", "System.Diagnostics.DiagnosticSource": "[6.0.0, 9.0.0)", "System.Text.Json": "[6.0.0, 9.0.0)" } @@ -590,8 +590,8 @@ }, "Std.UriTemplate": { "type": "Transitive", - "resolved": "0.0.46", - "contentHash": "/cCCMsB3i+MVt5LTbl236dnFd/BE4dKzzzC1teGTpAHzwPTiLIuD5hioGgtPuli/enAj8Dhmt/e9JlVUIITIgQ==" + "resolved": "0.0.50", + "contentHash": "ro7KBMw+5GR+3gyszCl3zUQroX6+I39u9K4Gu12KZNmepOhpLQppKcdcLJY18H3PhX6O05Tgo6rO6lryFW7mew==" }, "System.Collections": { "type": "Transitive", @@ -638,11 +638,11 @@ }, "System.IdentityModel.Tokens.Jwt": { "type": "Transitive", - "resolved": "7.0.3", - "contentHash": "caEe+OpQNYNiyZb+DJpUVROXoVySWBahko2ooNfUcllxa9ZQUM8CgM/mDjP6AoFn6cQU9xMmG+jivXWub8cbGg==", + "resolved": "7.2.0", + "contentHash": "Z3Fmkrxkp+o51ANMO/PqASRRlEz8dH4mTWwZXMFMXZt2bUGztBiNcIDnwBCElYLYpzpmz4sIqHb6aW8QVLe6YQ==", "dependencies": { - "Microsoft.IdentityModel.JsonWebTokens": "7.0.3", - "Microsoft.IdentityModel.Tokens": "7.0.3" + "Microsoft.IdentityModel.JsonWebTokens": "7.2.0", + "Microsoft.IdentityModel.Tokens": "7.2.0" } }, "System.IO": { @@ -801,8 +801,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OdrZO2WjkiEG6ajEFRABTRCi/wuXQPxeV6g8xvUJqdxMvvuCCEk86zPla8UiIQJz3durtUEbNyY/3lIhS0yZvQ==", + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", "dependencies": { "System.Text.Encodings.Web": "8.0.0" } From bae5fb73cfd15459c94c5ef53e99cc21ecd412e2 Mon Sep 17 00:00:00 2001 From: Caleb Kiage <747955+calebkiage@users.noreply.github.com> Date: Fri, 19 Jan 2024 15:44:41 +0300 Subject: [PATCH 5/5] Fix dockerfile & launch.json file --- .azure-pipelines/release-cli.yaml | 2 +- .vscode/launch.json | 46 +++++++++++++++++++++++++++---- Dockerfile | 4 +-- 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/release-cli.yaml b/.azure-pipelines/release-cli.yaml index cbdf430db5..8751a7b92b 100644 --- a/.azure-pipelines/release-cli.yaml +++ b/.azure-pipelines/release-cli.yaml @@ -448,7 +448,7 @@ stages: script: | $path = '$(ARTIFACTS_PATH)' if ('$(IS_NUGET)'.ToLower() -eq 'true' -and ('${{ parameters.simulate }}'.ToLower() -ne 'true')) { - $path = './src/obj/$(buildConfiguration)/net7.0' + $path = './src/obj/$(buildConfiguration)/net8.0' } Write-Verbose "Checking if $path has files" $hasArtifacts = Test-Path $path/* -PathType Leaf diff --git a/.vscode/launch.json b/.vscode/launch.json index d5c9340159..563029e0ce 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/bin/Debug/net7.0/mgc.dll", + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", "args": ["-h"], "cwd": "${workspaceFolder}/src", "envFile": "${workspaceFolder}/src/.env", @@ -21,7 +21,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/bin/Debug/net7.0/mgc.dll", + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", "args": ["login"], "cwd": "${workspaceFolder}/src", "envFile": "${workspaceFolder}/src/.env", @@ -33,7 +33,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/bin/Debug/net7.0/mgc.dll", + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", "args": ["me", "get", "--output", "TABLE"], "cwd": "${workspaceFolder}/src", "envFile": "${workspaceFolder}/src/.env", @@ -45,17 +45,53 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/src/bin/Debug/net6.0/mgc.dll", + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", "args": ["users", "item", "patch", "--user-id", "admin@M365x258755.OnMicrosoft.com", "--body", "{\"officeLocation\": \"NewLocation\"}", "--debug"], "cwd": "${workspaceFolder}/src", "envFile": "${workspaceFolder}/src/.env", "console": "internalConsole", "stopAtEntry": false }, + { + "name": "sites get", + "type": "coreclr", + "request": "launch", + // "preLaunchTask": "build", + "justMyCode": false, + "symbolOptions": { + "searchPaths": [], + "searchMicrosoftSymbolServer": false, + "searchNuGetOrgSymbolServer": true + }, + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", + "args": ["sites", "list", "--debug"], + "cwd": "${workspaceFolder}/src", + "envFile": "${workspaceFolder}/src/.env", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "identity get", + "type": "coreclr", + "request": "launch", + // "preLaunchTask": "build", + "justMyCode": false, + // "symbolOptions": { + // "searchPaths": [], + // "searchMicrosoftSymbolServer": false, + // "searchNuGetOrgSymbolServer": true + // }, + "program": "${workspaceFolder}/src/bin/Debug/net8.0/mgc.dll", + "args": ["identity", "get", "--debug"], + "cwd": "${workspaceFolder}/src", + "envFile": "${workspaceFolder}/src/.env", + "console": "internalConsole", + "stopAtEntry": false + }, { "name": ".NET Core Attach", "type": "coreclr", "request": "attach" } ] -} \ No newline at end of file +} diff --git a/Dockerfile b/Dockerfile index cd51d8fa7a..7e36cde995 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # 2. Use the \\?\ prefix when specifying the path in the docker build command. e.g. # docker build \\?\C:\path -f .\Dockerfile # See https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build-env +FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build-env ARG MSGRAPH_NUGET_URL=https://nuget.pkg.github.com/microsoftgraph/index.json @@ -16,7 +16,7 @@ WORKDIR /app/msgraph-cli RUN dotnet publish -p:PublishSingleFile=false -p:PublishReadyToRun=true -p:PublishReadyToRunShowWarnings=true ./src/msgraph-cli.csproj --configuration Release --no-self-contained --runtime linux-musl-x64 --output /app/output -FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine as runtime +FROM mcr.microsoft.com/dotnet/runtime:8.0-alpine as runtime # Change this password by providing a different value when running the container ENV KEYRING_PASSWORD="password"