Skip to content

Commit

Permalink
Merge pull request #9 from microsoftgraph/fix/use-graph-beta
Browse files Browse the repository at this point in the history 
Fix issue with the beta api calling v1 endpoints
  • Loading branch information
@calebkiage
calebkiage authored Jul 28, 2023
2 parents a3254b6 + 83f09cf commit 75e88b3
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 49 deletions.
4 changes: 2 additions & 2 deletions src/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ static IHostBuilder CreateHostBuilder(string[] args) =>
{
GraphProductPrefix = "graph-cli",
GraphServiceLibraryClientVersion = $"{assemblyVersion?.Major ?? 0}.{assemblyVersion?.Minor ?? 0}.{assemblyVersion?.Build ?? 0}",
GraphServiceTargetVersion = "1.0"
GraphServiceTargetVersion = "beta"
};
return GraphCliClientFactory.GetDefaultClient(options, loggingHandler: p.GetRequiredService<LoggingHandler>());
return GraphCliClientFactory.GetDefaultClient(options, version: "beta", loggingHandler: p.GetRequiredService<LoggingHandler>());
});
services.AddSingleton<IAuthenticationProvider>(p =>
{
Expand Down
4 changes: 2 additions & 2 deletions src/msgraph-cli-beta.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>mgc-beta</AssemblyName>
<Version>0.1.0-preview.1</Version>
<Version>0.1.1-preview.1</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -26,7 +26,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Graph.Cli.Core" Version="1.0.0-preview.1" />
<PackageReference Include="Microsoft.Graph.Cli.Core" Version="1.0.0-preview.2" />
<PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
</ItemGroup>
</Project>
90 changes: 45 additions & 45 deletions src/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
},
"Microsoft.Graph.Cli.Core": {
"type": "Direct",
"requested": "[1.0.0-preview.1, )",
"resolved": "1.0.0-preview.1",
"contentHash": "AEIEpWyJtgnKY/GsVjTGW5iXO481SqIXydgYCvJKtncgoNE0ImXoK33DCpZEJbL4WFinLfRyKAu0M9J82A8ovQ==",
"requested": "[1.0.0-preview.2, )",
"resolved": "1.0.0-preview.2",
"contentHash": "1nPmDUPuad5W63m3iVY5C8AwIAeYURr5kXe64t3Y5MziueunUh4V0RcfKgR+wAFXY/e4NxDKWjrMc+wHE8PdEA==",
"dependencies": {
"Azure.Identity": "1.9.0",
"JmesPath.Net": "1.0.308",
"Microsoft.Extensions.Hosting": "7.0.1",
"Microsoft.Extensions.Http": "7.0.0",
"Microsoft.Graph.Core": "3.0.7",
"Microsoft.Graph.Core": "3.0.9",
"Microsoft.Kiota.Cli.Commons": "0.3.1-preview.1",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.0.4",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.0.6",
"Spectre.Console": "0.47.0",
"System.CommandLine": "2.0.0-beta4.22272.1"
}
Expand All @@ -69,8 +69,8 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.32.0",
"contentHash": "NmnJxaNqKjPwnHXngVg63SrkwbJXrkT0mcK8uCx9rSq0nK6Q3Q+/GZRCaTWcdcECoRP5XK0lr3Ce8PZkHkuHNg==",
"resolved": "1.33.0",
"contentHash": "p06/5ueyCwKe09zqz7bPR6vbWRGrDy6Ot4aqjrjnowhFlXUBoljUdH+abDZP2vUuSZrOSstF4h860hBHWh8uHg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "1.1.1",
"System.Diagnostics.DiagnosticSource": "4.6.0",
Expand Down Expand Up @@ -365,13 +365,13 @@
},
"Microsoft.Graph.Core": {
"type": "Transitive",
"resolved": "3.0.7",
"contentHash": "MZHQdGhFOkBcSIarQ579gxvqHSFdrJOwskxhoAC35dVs6/H8Ol4HQP+Vh+kIUuViAI/O/hxiS0YDPeHhd9afzw==",
"resolved": "3.0.9",
"contentHash": "7qvVCvRlAjsgLgb6psFxb8N3pTLvzpffOOaKUez7u5tkO69nzUT0ofmQp5eyIQz/xxT4IXiB/CE1ycvYaalO5g==",
"dependencies": {
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.30.1",
"Microsoft.Kiota.Abstractions": "1.1.2",
"Microsoft.Kiota.Authentication.Azure": "1.0.2",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.0.2",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.31.0",
"Microsoft.Kiota.Abstractions": "1.1.4",
"Microsoft.Kiota.Authentication.Azure": "1.0.3",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.0.5",
"Microsoft.Kiota.Serialization.Form": "1.0.1",
"Microsoft.Kiota.Serialization.Json": "1.0.6",
"Microsoft.Kiota.Serialization.Text": "1.0.1",
Expand Down Expand Up @@ -399,72 +399,72 @@
},
"Microsoft.IdentityModel.Abstractions": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "1YVmnuYYz53M+KGa7HvZ+Vvqchwp97ngDk2I4QoiQi+HL7rpifvyaMyVMFhdlmoRlQcnSwJbNp7ulPctGnFfkQ=="
"resolved": "6.31.0",
"contentHash": "SBa2DGEZpMThT3ki6lOK5SwH+fotHddNBKH+pfqrlINnl999BreRS9G0QiLruwfmcTDnFr8xwmNjoGnPQqfZwg=="
},
"Microsoft.IdentityModel.JsonWebTokens": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "H9o5zbuxfRKCEVULmxLCv1LTz1hmzaqG2Gk6X9Yq0QeJ1HeUQo1fwjaj+N1H55TQnZ8LNbmMdMCl/VqW3cJWvw==",
"resolved": "6.31.0",
"contentHash": "r0f4clrrlFApwSf2GRpS5X8hL54h1WUlZdq9ZoOy+cJOOqtNhhdfkfkqwxsTGCH/Ae7glOWNxykZzyRXpwcXVQ==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "6.30.1",
"Microsoft.IdentityModel.Tokens": "6.31.0",
"System.Text.Encoding": "4.3.0",
"System.Text.Encodings.Web": "4.7.2",
"System.Text.Json": "4.7.2"
}
},
"Microsoft.IdentityModel.Logging": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "zE6TG08T8MPZfkXqOWegvvIhKZRiYyj2xgr4QQuWyXypSGPyZrkBwJf5IXU4T3aIKqVfALSnAYCW/IqMaCY4gA==",
"resolved": "6.31.0",
"contentHash": "YzW5O27nTXxNgNKm+Pud7hXjUlDa2JshtRG+WftQvQIsBUpFA/WjhxG2uO8YanfXbb/IT9r8Cu/VdYkvZ3+9/g==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.30.1"
"Microsoft.IdentityModel.Abstractions": "6.31.0"
}
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "jGmIsLKfgZC6p/oNZVt/OOl5hubV299x0cUFkQ7mDTb9G1kr5neuvgdohKKSGIEjec3Y4HMAb1sMX41OnIfRIA==",
"resolved": "6.31.0",
"contentHash": "Z6Vl3KKfVzfSunuNOk9juXxYWVhYVaWOt75xhN+TklDBMbwSoy0Go/4tnxp5A2XoTQVkoWY47p+X0MuMa8G12w==",
"dependencies": {
"Microsoft.IdentityModel.Logging": "6.30.1",
"Microsoft.IdentityModel.Tokens": "6.30.1"
"Microsoft.IdentityModel.Logging": "6.31.0",
"Microsoft.IdentityModel.Tokens": "6.31.0"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "Ps5Yy9HVEHkzRP0qjWO+Bmm45/EZ0TvMfQEKrbhFF+kspEZWAvoqVgnYZf21aqrr7kTXG9KH3CgyIcJPonhO2g==",
"resolved": "6.31.0",
"contentHash": "jSYqhKYhR7oU7qmnnMjkPsbjgZ7jQFee8z69K4VwEFXBrfy9wl57n/i1r1olzTwaxb1eRKye5GpdxwFfzJYjfA==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "6.30.1",
"System.IdentityModel.Tokens.Jwt": "6.30.1"
"Microsoft.IdentityModel.Protocols": "6.31.0",
"System.IdentityModel.Tokens.Jwt": "6.31.0"
}
},
"Microsoft.IdentityModel.Tokens": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "iLEwF/zEopanfMQcIcq190S/bBjSj3v6UfqN37KqRqsKB9kkm3/tYCrIQOtvLKbEe/znQXC6HoQhknDTszPz2Q==",
"resolved": "6.31.0",
"contentHash": "Q1Ej/OAiqi5b/eB8Ozo5FnQ6vlxjgiomnWWenDi2k7+XqhkA2d5TotGtNXpWcWiGmrotNA/o8p51YesnziA0Sw==",
"dependencies": {
"Microsoft.CSharp": "4.5.0",
"Microsoft.IdentityModel.Logging": "6.30.1",
"Microsoft.IdentityModel.Logging": "6.31.0",
"System.Security.Cryptography.Cng": "4.5.0"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Transitive",
"resolved": "1.1.3",
"contentHash": "KuI2IHOiU6eE0e1b5naICkV0uR18H8cCORCxayRtJvytBx+5yPORIHawyWu9t1g9yzCt1HhF/4vMbrVEWbqdow==",
"resolved": "1.2.1",
"contentHash": "yydlj/tebHpUFPrRTiQbLlAo0Ow+2zxGC+cC4Cxwy/qzbUlfi26ImM8u7hu4UPJsmUkh5m8zOZ+2L6jY7ML7bQ==",
"dependencies": {
"System.Diagnostics.DiagnosticSource": "[6.0.0, 8.0.0)",
"Tavis.UriTemplates": "2.0.0"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Transitive",
"resolved": "1.0.2",
"contentHash": "71ypENz5SzFdTETt8ydvyKGw6HsId8Ey/B0Ij1uc4CMQ1OI+v8ukzW6BBPeUXbhj5qEEBW41/aVQ1AxK+vn8fg==",
"resolved": "1.0.3",
"contentHash": "jRnYE73KVDsFYwxUgG53S+3rWx/1R/zsoMhJJoj7Q7dnNUuuUt9KXff8OJ8/DWDYVj0GXB0N67yfY+AfAr6XzA==",
"dependencies": {
"Azure.Core": "1.30.0",
"Microsoft.Kiota.Abstractions": "1.1.0",
"Azure.Core": "1.33.0",
"Microsoft.Kiota.Abstractions": "1.1.4",
"System.Diagnostics.DiagnosticSource": "[6.0.0, 8.0.0)"
}
},
Expand All @@ -482,10 +482,10 @@
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Transitive",
"resolved": "1.0.4",
"contentHash": "oUaJJ2ISPGa5fcX6O/M8KZYhmM3KJqf5G4VDE7gC4kr31lxPaoOnBlTcFllOcxVD9Nv5emcDT/MFPsLQ/2wYcg==",
"resolved": "1.0.6",
"contentHash": "iWfcrXSROJcab4q5qRTcn1f5O5UDZQd1CRwFyOXiVaxk2/kMvSmWYM3Xjuv4cMcYTvM55dbmA1YWXlntW88m2w==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.1.3",
"Microsoft.Kiota.Abstractions": "1.2.1",
"System.Diagnostics.DiagnosticSource": "[6.0.0, 8.0.0)",
"System.Text.Json": "[6.0.0, 8.0.0)"
}
Expand Down Expand Up @@ -607,11 +607,11 @@
},
"System.IdentityModel.Tokens.Jwt": {
"type": "Transitive",
"resolved": "6.30.1",
"contentHash": "THhcemCnzUJnrCojmNmafJGluAmfumVFT18oSPa+epEfVuiXXdmitu7UvmayMq6FrBJKrZzHdVfh7CXg+uvBPQ==",
"resolved": "6.31.0",
"contentHash": "OTlLhhNHODxZvqst0ku8VbIdYNKi25SyM6/VdbpNUe6aItaecVRPtURGvpcQpzltr9H0wy+ycAqBqLUI4SBtaQ==",
"dependencies": {
"Microsoft.IdentityModel.JsonWebTokens": "6.30.1",
"Microsoft.IdentityModel.Tokens": "6.30.1"
"Microsoft.IdentityModel.JsonWebTokens": "6.31.0",
"Microsoft.IdentityModel.Tokens": "6.31.0"
}
},
"System.IO": {
Expand Down

0 comments on commit 75e88b3

Please sign in to comment.