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

Auto skip logo when unavailable #130

Merged
merged 3 commits into from
Nov 13, 2024
Merged
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
2 changes: 1 addition & 1 deletion src/Svrooij.WinTuner.CmdLets/Commands/DeployWtWin32App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ protected override async Task ProcessAuthenticatedAsync(IAuthenticationProvider
logger?.LogDebug("Loading package info from folder {PackageFolder}", PackageFolder);
var packageInfo = await metadataManager!.LoadPackageInfoFromFolderAsync(PackageFolder, cancellationToken);
App = metadataManager.ConvertPackageInfoToWin32App(packageInfo);
LogoPath = Path.Combine(PackageFolder, "..", "logo.png");
LogoPath = Path.GetFullPath(Path.Combine(PackageFolder, "..", "logo.png"));
IntuneWinFile = metadataManager.GetIntuneWinFileName(PackageFolder, packageInfo);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Svrooij.PowerShell.DependencyInjection" Version="1.1.4" />
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.19">
<PrivateAssets>All</PrivateAssets>
Expand Down
178 changes: 88 additions & 90 deletions src/Svrooij.WinTuner.CmdLets/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
"net6.0": {
"Azure.Identity": {
"type": "Direct",
"requested": "[1.12.0, )",
"resolved": "1.12.0",
"contentHash": "OBIM3aPz8n9oEO5fdnee+Vsc5Nl4W3FeslPpESyDiyByntQI5BAa76KD60eFXm9ulevnwxGZP9YXL8Y+paI5Uw==",
"dependencies": {
"Azure.Core": "1.40.0",
"Microsoft.Identity.Client": "4.61.3",
"Microsoft.Identity.Client.Extensions.Msal": "4.61.3",
"System.Memory": "4.5.4",
"System.Security.Cryptography.ProtectedData": "4.7.0",
"System.Text.Json": "4.7.2",
"requested": "[1.13.1, )",
"resolved": "1.13.1",
"contentHash": "4eeK9XztjTmvA4WN+qAvlUCSxSv45+LqTMeC8XT2giGGZHKthTMU2IuXcHjAOf5VLH3wE3Bo6EwhIcJxVB8RmQ==",
"dependencies": {
"Azure.Core": "1.44.1",
"Microsoft.Identity.Client": "4.66.1",
"Microsoft.Identity.Client.Extensions.Msal": "4.66.1",
"System.Memory": "4.5.5",
"System.Text.Json": "6.0.10",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
Expand Down Expand Up @@ -60,16 +59,16 @@
},
"Azure.Core": {
"type": "Transitive",
"resolved": "1.42.0",
"contentHash": "Fg88OsrjD2nAvz3N0pk2d/AwIHQRrs9CjA9A35OW1YgYhMo0OTz4WkntQK6V2tf84g7SnfJM8ORcZl+bH6P9Cg==",
"resolved": "1.44.1",
"contentHash": "YyznXLQZCregzHvioip07/BkzjuWNXogJEVz9T5W6TwjNr17ax41YGzYMptlo2G10oLCuVPoyva62y0SIRDixg==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
"System.ClientModel": "1.0.0",
"System.ClientModel": "1.1.0",
"System.Diagnostics.DiagnosticSource": "6.0.1",
"System.Memory.Data": "1.0.2",
"System.Memory.Data": "6.0.0",
"System.Numerics.Vectors": "4.5.0",
"System.Text.Encodings.Web": "6.0.0",
"System.Text.Json": "4.7.2",
"System.Text.Json": "6.0.10",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
Expand Down Expand Up @@ -250,44 +249,44 @@
},
"Microsoft.Graph.Core": {
"type": "Transitive",
"resolved": "3.1.20",
"contentHash": "/DDV57/pYoTTefliIIoXhg0JMbRvkYFsoSvyo337ybh+PfNJHgjtyOrt3Ij63OIK+TzrItNMzuMDXh57zBg6og==",
"resolved": "3.2.0",
"contentHash": "NlRqG6+1i2sE6AYJHBsAC9SiD1OMBonibiZUJgnWFujAeRAZR4lQ1gywf4B+y7YNa8xjxSHDm5hEmEdmcCt7UQ==",
"dependencies": {
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.0.1",
"Microsoft.IdentityModel.Validators": "8.0.1",
"Microsoft.Kiota.Abstractions": "1.12.2",
"Microsoft.Kiota.Authentication.Azure": "1.12.2",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.12.2",
"Microsoft.Kiota.Serialization.Form": "1.11.3",
"Microsoft.Kiota.Serialization.Json": "1.12.2",
"Microsoft.Kiota.Serialization.Multipart": "1.11.3",
"Microsoft.Kiota.Serialization.Text": "1.11.3"
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.0.2",
"Microsoft.IdentityModel.Validators": "8.0.2",
"Microsoft.Kiota.Abstractions": "1.14.0",
"Microsoft.Kiota.Authentication.Azure": "1.14.0",
"Microsoft.Kiota.Http.HttpClientLibrary": "1.14.0",
"Microsoft.Kiota.Serialization.Form": "1.14.0",
"Microsoft.Kiota.Serialization.Json": "1.14.0",
"Microsoft.Kiota.Serialization.Multipart": "1.14.0",
"Microsoft.Kiota.Serialization.Text": "1.14.0"
}
},
"Microsoft.Identity.Client": {
"type": "Transitive",
"resolved": "4.64.0",
"contentHash": "LY5Mr3+UdjWdc5ej93bE0uYTs5ZpD4zzg3w69tSO8b+JieEGZ6t0eUX003/x7gPadsxCw2RKLNKtfRGxWrUsNQ==",
"resolved": "4.66.2",
"contentHash": "OsWRWpJs5iY9DxAF7DfWRGVNeFhjz75x+/bpHKB9Hbnu3THUgqYfQrYeQMgwx30ctweiV7h00aQpEua2kLeUpg==",
"dependencies": {
"Microsoft.IdentityModel.Abstractions": "6.35.0",
"System.Diagnostics.DiagnosticSource": "6.0.1"
}
},
"Microsoft.Identity.Client.Broker": {
"type": "Transitive",
"resolved": "4.64.0",
"contentHash": "ZFUkqefAwUo81PtUj0gC92iwqOLpBVSdEPy1rncF77hPvN+O/86Vaygz9WhJ9gnZXkIenkfxboKAX2e/9h73Iw==",
"resolved": "4.66.2",
"contentHash": "KpvVCdtujXafUCh2tYUNEcRrrU93+og8KTCjC+gKuSlIFwp0emdvDTXm/hqYUxO+wsdJdaqlaFvUeWzmhYt56A==",
"dependencies": {
"Microsoft.Identity.Client": "4.64.0",
"Microsoft.Identity.Client": "4.66.2",
"Microsoft.Identity.Client.NativeInterop": "0.16.2"
}
},
"Microsoft.Identity.Client.Extensions.Msal": {
"type": "Transitive",
"resolved": "4.64.0",
"contentHash": "7bQCUz6rYBJYeVm3548dizD+Ww+ZSBUTignAZM5N8EUvG9ItSsUDeCVxDghidOqvbI9WBtEQe9v4BG/Eu7lOgg==",
"resolved": "4.66.2",
"contentHash": "ROTuFu8CTbENzCu0aan3n557EeakD4DKBXiK/ph+m9YNnwWdTfPTZMLSEmMzBorajYG3n7QGuang898AIcR+8w==",
"dependencies": {
"Microsoft.Identity.Client": "4.64.0",
"Microsoft.Identity.Client": "4.66.2",
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
Expand Down Expand Up @@ -319,19 +318,19 @@
},
"Microsoft.IdentityModel.Protocols": {
"type": "Transitive",
"resolved": "8.0.1",
"contentHash": "uA2vpKqU3I2mBBEaeJAWPTjT9v1TZrGWKdgK6G5qJd03CLx83kdiqO9cmiK8/n1erkHzFBwU/RphP83aAe3i3g==",
"resolved": "8.0.2",
"contentHash": "l6W99hw88Kd+2m7N7WMzo/PxiHRI6TD8hsWs2XlbEs6BWgRtLAeyNlASst1QOznDvQa2kPl9nMpvgo5Hbo7gsQ==",
"dependencies": {
"Microsoft.IdentityModel.Tokens": "8.0.1"
"Microsoft.IdentityModel.Tokens": "8.0.2"
}
},
"Microsoft.IdentityModel.Protocols.OpenIdConnect": {
"type": "Transitive",
"resolved": "8.0.1",
"contentHash": "AQDbfpL+yzuuGhO/mQhKNsp44pm5Jv8/BI4KiFXR7beVGZoSH35zMV3PrmcfvSTsyI6qrcR898NzUauD6SRigg==",
"resolved": "8.0.2",
"contentHash": "1s4MqU31FWqZD5Lhcv4tOYq2P4q77eVHQJMnNCESaOwMaDAcx/FKUz9HlAngBfFNaIZj9KHQVtyXbIJXb/M8rw==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "8.0.1",
"System.IdentityModel.Tokens.Jwt": "8.0.1"
"Microsoft.IdentityModel.Protocols": "8.0.2",
"System.IdentityModel.Tokens.Jwt": "8.0.2"
}
},
"Microsoft.IdentityModel.Tokens": {
Expand All @@ -344,70 +343,70 @@
},
"Microsoft.IdentityModel.Validators": {
"type": "Transitive",
"resolved": "8.0.1",
"contentHash": "jBxsa+u/6nE8qlGMl4tp+AeQEd3r/1fxE9Ex0bknKsSPi97LrkW5nT23v8m+A91x1KvlCoPPE8nIfuZDxFMu8A==",
"resolved": "8.0.2",
"contentHash": "1uTRGf1EWyWRihAg7ZmzQ+T6bkzJcpZIm3xa85F//1cUFyD+nyxixhhnBQ0LjW17i/vLvANeDVPHCPh0xk006w==",
"dependencies": {
"Microsoft.IdentityModel.Protocols": "8.0.1",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.0.1",
"Microsoft.IdentityModel.Tokens": "8.0.1",
"System.IdentityModel.Tokens.Jwt": "8.0.1"
"Microsoft.IdentityModel.Protocols": "8.0.2",
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "8.0.2",
"Microsoft.IdentityModel.Tokens": "8.0.2",
"System.IdentityModel.Tokens.Jwt": "8.0.2"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "cQQsaviratxNzfGfm+2famoIoXeMvGswPCFQVDKMoIpHb6zinHK4AMNHSckjjeWlLdWnFWLUU+o4tehnzsrbpw==",
"resolved": "1.14.0",
"contentHash": "So3FWhqba6gvRpXMKGK826mNuQjh699Zxoui5AvUMJ9KA1LNnqFIxJ2cx2dqdb0FcMHJ+FZCrNQbMg1XqvCVBQ==",
"dependencies": {
"Std.UriTemplate": "1.0.5"
"Std.UriTemplate": "2.0.0"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "/Yn7s2ysJmtcVaPngvinG8ZuiIeiY4yRFUmdX/wOZCojyFj3c948tQcybD1KcW8Oz+sGA6TF+wUhwStR4Xfjig==",
"resolved": "1.14.0",
"contentHash": "kjJBHbP6kJRwMacHqJhEHSgIN9ur5JDRlLj7sYUdZdysngb3uS+qOZIqVIOtcnrSJ8ZUsHy3bdfAVkdnuEpg8A==",
"dependencies": {
"Azure.Core": "1.42.0",
"Microsoft.Kiota.Abstractions": "1.12.2"
"Azure.Core": "1.44.1",
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "h9uiiysinSJVLDIHM/UK7HK2GKF+4MYGrixP8j+DngCK6U9kwLJg6bYOYTGDtJmlRRr0Z1oIGPoYsLn2PLDOhA==",
"resolved": "1.14.0",
"contentHash": "4ngpgjtCVXvBo2GAegJLVW4Bn8TyH5MD3gu0Se5/vMwFnpqzEaibIX1xMzKQiZJWWaormZA+Z4wl1/wxTBteTw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "qeOOkVw6iB7xbDaFzlvE4x/LTAQ/EeuVHJEl0LwdE1nm9elrLZtQrUW1juwsnFIiTLkyEfR5lebfTK9Wln5iRw==",
"resolved": "1.14.0",
"contentHash": "aueCKgh+lby9QzEkYCtZpzP4OUL/AAZ43O3A7v0EQjTCsNYo3sYnz5a5Rtz/Hjyd26xN5x2TilWPfgFg+X0QiA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Kiota.Serialization.Json": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "ZJb5fAuvpnSa8NqhCyGEUlx7agLX+ykyz6xF1egH4pLxhOXG2yMxVgeEc+Kg52ZdI5RBiFAdo0OiTl/H6ajLgg==",
"resolved": "1.14.0",
"contentHash": "oGt74kVtlIooh2KiBf9GGi9dUYz/xWkStxd/oawS0mxqSNm/eiNcwFNU3odUDxKfKjF9+zPJxDzkEE0rILus8w==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "FN6RNDPyOwnVcBvtElHE/C3Eky7RC3GL5//XVC6GbW/2YGCZJdcbATcFpQ7KlWGNSuf31zrS/mltT+dh8yauSA==",
"resolved": "1.14.0",
"contentHash": "gzciQfs3v4h0TZcmeXjaIf+j+MGw+frXuXvGkrWP4BlJOv4NmVT614rmvfEWAUfDnVwfn3FP1ghEodHb1RI7vw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "0vw3voEjENx2cXBqVFOhOGnqzC9ECBlpYhkEPXr8D+pTBYl8RDPS3N2mVWaib4CASqrwqqKYCksTGVpsnDA8Pw==",
"resolved": "1.14.0",
"contentHash": "Q7AMnooas6aG55mBENwU2Wz9Ey1fwN3DfrzNlR2iUolalMftLtXGZeNY7gSYEBtCOo65OEhmSszrOlxNkFD92w==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
"Microsoft.Kiota.Abstractions": "1.14.0"
}
},
"Microsoft.Management.Infrastructure": {
Expand Down Expand Up @@ -688,8 +687,8 @@
},
"Std.UriTemplate": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "ry++apw4RKBw/9N8TQxnTTQYf/lgGGdn9+mq7AUMf860qD8STssQRe5tRX0NO99rGwpSRZzHO7u6ebQ/wahSNw=="
"resolved": "2.0.0",
"contentHash": "GNBep1IBAGlVG3TUs1ZZ+1H9jgsw1ojBF6u34o8hpZC/YSTJCzCu4uYGU76a8SvhC8Q8baGqnmwJjHdxsVSUyg=="
},
"SvRooij.ContentPrep": {
"type": "Transitive",
Expand All @@ -703,11 +702,11 @@
},
"System.ClientModel": {
"type": "Transitive",
"resolved": "1.0.0",
"contentHash": "I3CVkvxeqFYjIVEP59DnjbeoGNfo/+SZrCLpRz2v/g0gpCHaEMPtWSY0s9k/7jR1rAsLNg2z2u1JRB76tPjnIw==",
"resolved": "1.1.0",
"contentHash": "UocOlCkxLZrG2CKMAAImPcldJTxeesHnHGHwhJ0pNlZEvEXcWKuQvVOER2/NiOkJGRJk978SNdw3j6/7O9H1lg==",
"dependencies": {
"System.Memory.Data": "1.0.2",
"System.Text.Json": "4.7.2"
"System.Text.Json": "6.0.9"
}
},
"System.CodeDom": {
Expand Down Expand Up @@ -884,16 +883,15 @@
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.4",
"contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
},
"System.Memory.Data": {
"type": "Transitive",
"resolved": "1.0.2",
"contentHash": "JGkzeqgBsiZwKJZ1IxPNsDFZDhUvuEdX8L8BDC8N3KOj+6zMcNU28CNN59TpZE/VJYy9cP+5M+sbxtWJx3/xtw==",
"resolved": "6.0.0",
"contentHash": "ntFHArH3I4Lpjf5m4DCXQHJuGwWPNVJPaAvM95Jy/u+2Yzt2ryiyIN04LAogkjP9DeRcEOiviAjQotfmPq/FrQ==",
"dependencies": {
"System.Text.Encodings.Web": "4.7.2",
"System.Text.Json": "4.6.0"
"System.Text.Json": "6.0.0"
}
},
"System.Net.Http.WinHttpHandler": {
Expand Down Expand Up @@ -1068,8 +1066,8 @@
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "bAkhgDJ88XTsqczoxEMliSrpijKZHhbJQldhAmObj/RbrN3sU5dcokuXmWJWsdQAhiMJ9bTayWsL1C9fbbCRhw==",
"resolved": "8.0.5",
"contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "8.0.0"
Expand Down Expand Up @@ -1116,16 +1114,16 @@
"wingetintune": {
"type": "Project",
"dependencies": {
"Azure.Core": "[1.42.0, )",
"Azure.Core": "[1.44.1, )",
"Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )",
"Microsoft.CSharp": "[4.7.0, )",
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Extensions.Logging.Abstractions": "[8.0.1, )",
"Microsoft.Extensions.Options": "[8.0.2, )",
"Microsoft.Graph.Beta": "[5.78.0-preview, )",
"Microsoft.Graph.Core": "[3.1.20, )",
"Microsoft.Identity.Client.Broker": "[4.64.0, )",
"Microsoft.Identity.Client.Extensions.Msal": "[4.64.0, )",
"Microsoft.Graph.Core": "[3.2.0, )",
"Microsoft.Identity.Client.Broker": "[4.66.2, )",
"Microsoft.Identity.Client.Extensions.Msal": "[4.66.2, )",
"Riok.Mapperly": "[3.6.0, )",
"SvRooij.ContentPrep": "[0.1.3-alpha0001, )",
"System.IdentityModel.Tokens.Jwt": "[8.0.2, )",
Expand All @@ -1137,10 +1135,10 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Http": "[8.0.0, )",
"Microsoft.Kiota.Abstractions": "[1.12.0, )",
"Microsoft.Kiota.Http.HttpClientLibrary": "[1.12.0, )",
"Microsoft.Kiota.Serialization.Json": "[1.12.0, )",
"System.Text.Json": "[8.0.4, )"
"Microsoft.Kiota.Abstractions": "[1.14.0, )",
"Microsoft.Kiota.Http.HttpClientLibrary": "[1.14.0, )",
"Microsoft.Kiota.Serialization.Json": "[1.14.0, )",
"System.Text.Json": "[8.0.5, )"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/WinTuner.Proxy.Client/WinTuner.Proxy.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.12.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.14.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.14.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.14.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>
<Target Name="GenerateRestClient" DependsOnTargets="CleanGenerateRestClient;AutoGenerateRestClient">

Expand Down
2 changes: 1 addition & 1 deletion src/WingetIntune.Cli/WingetIntune.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="ConsoleTables" Version="2.6.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
Expand Down
Loading
Loading