Skip to content

Commit

Permalink
Merge pull request #112 from svrooij/feature/deploy-issue
Browse files Browse the repository at this point in the history
Fix Deploy cannot create abstract class
  • Loading branch information
svrooij authored Sep 3, 2024
2 parents 99ae8df + 25f6942 commit 84c88b2
Show file tree
Hide file tree
Showing 6 changed files with 143 additions and 183 deletions.
2 changes: 2 additions & 0 deletions src/Svrooij.WinTuner.CmdLets/Commands/DeployWtWin32App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ protected override async Task ProcessAuthenticatedAsync(IAuthenticationProvider
logger?.LogDebug("Loading Win32LobApp from file {Win32LobAppFile}", win32LobAppFile);
var json = await File.ReadAllTextAsync(win32LobAppFile, cancellationToken);
App = await KiotaSerializer.DeserializeAsync<GraphModels.Win32LobApp>("application/json", json, cancellationToken);
App!.BackingStore.InitializationCompleted = false;
App.BackingStore.ReturnOnlyChangedValues = false;
IntuneWinFile = Path.Combine(PackageFolder, App!.FileName!);
}
else
Expand Down
25 changes: 9 additions & 16 deletions src/Svrooij.WinTuner.CmdLets/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,10 @@
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "MtKfAQEzfxZndL05xofNRiU20hj5fgwPQEAL1kujIFH+K/zKjMhHCauDQIHWWIbBBuyGpdnKRfL0mA53ruzvlQ==",
"resolved": "1.11.3",
"contentHash": "qeOOkVw6iB7xbDaFzlvE4x/LTAQ/EeuVHJEl0LwdE1nm9elrLZtQrUW1juwsnFIiTLkyEfR5lebfTK9Wln5iRw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Json": {
Expand All @@ -396,18 +396,18 @@
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "NfWpMyKaJM6hMRoebGavN+9TDPwnwzcqnnNZfyds6M5AEli9OSHONkn/71g8QDF1nQAhPiDwAYncQ5hUZjhFMQ==",
"resolved": "1.11.3",
"contentHash": "FN6RNDPyOwnVcBvtElHE/C3Eky7RC3GL5//XVC6GbW/2YGCZJdcbATcFpQ7KlWGNSuf31zrS/mltT+dh8yauSA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "R/tjcz8eOhBHFE+xWgBhZDabVg3FYt2kBdVx2/qGutiFTD+U5AITud8iimW68TSHg7qDdh47LsvMuhiaod4uCg==",
"resolved": "1.11.3",
"contentHash": "0vw3voEjENx2cXBqVFOhOGnqzC9ECBlpYhkEPXr8D+pTBYl8RDPS3N2mVWaib4CASqrwqqKYCksTGVpsnDA8Pw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Management.Infrastructure": {
Expand Down Expand Up @@ -1126,13 +1126,6 @@
"Microsoft.Graph.Core": "[3.1.20, )",
"Microsoft.Identity.Client.Broker": "[4.64.0, )",
"Microsoft.Identity.Client.Extensions.Msal": "[4.64.0, )",
"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.12.2, )",
"Microsoft.Kiota.Serialization.Json": "[1.12.2, )",
"Microsoft.Kiota.Serialization.Multipart": "[1.12.2, )",
"Microsoft.Kiota.Serialization.Text": "[1.12.2, )",
"Riok.Mapperly": "[3.6.0, )",
"SvRooij.ContentPrep": "[0.1.3-alpha0001, )",
"System.IdentityModel.Tokens.Jwt": "[8.0.2, )",
Expand Down
25 changes: 9 additions & 16 deletions src/WingetIntune.Cli/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,10 @@
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "MtKfAQEzfxZndL05xofNRiU20hj5fgwPQEAL1kujIFH+K/zKjMhHCauDQIHWWIbBBuyGpdnKRfL0mA53ruzvlQ==",
"resolved": "1.11.3",
"contentHash": "qeOOkVw6iB7xbDaFzlvE4x/LTAQ/EeuVHJEl0LwdE1nm9elrLZtQrUW1juwsnFIiTLkyEfR5lebfTK9Wln5iRw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Json": {
Expand All @@ -601,18 +601,18 @@
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "NfWpMyKaJM6hMRoebGavN+9TDPwnwzcqnnNZfyds6M5AEli9OSHONkn/71g8QDF1nQAhPiDwAYncQ5hUZjhFMQ==",
"resolved": "1.11.3",
"contentHash": "FN6RNDPyOwnVcBvtElHE/C3Eky7RC3GL5//XVC6GbW/2YGCZJdcbATcFpQ7KlWGNSuf31zrS/mltT+dh8yauSA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "R/tjcz8eOhBHFE+xWgBhZDabVg3FYt2kBdVx2/qGutiFTD+U5AITud8iimW68TSHg7qDdh47LsvMuhiaod4uCg==",
"resolved": "1.11.3",
"contentHash": "0vw3voEjENx2cXBqVFOhOGnqzC9ECBlpYhkEPXr8D+pTBYl8RDPS3N2mVWaib4CASqrwqqKYCksTGVpsnDA8Pw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.NETCore.Platforms": {
Expand Down Expand Up @@ -787,13 +787,6 @@
"Microsoft.Graph.Core": "[3.1.20, )",
"Microsoft.Identity.Client.Broker": "[4.64.0, )",
"Microsoft.Identity.Client.Extensions.Msal": "[4.64.0, )",
"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.12.2, )",
"Microsoft.Kiota.Serialization.Json": "[1.12.2, )",
"Microsoft.Kiota.Serialization.Multipart": "[1.12.2, )",
"Microsoft.Kiota.Serialization.Text": "[1.12.2, )",
"Riok.Mapperly": "[3.6.0, )",
"SvRooij.ContentPrep": "[0.1.3-alpha0001, )",
"System.IdentityModel.Tokens.Jwt": "[8.0.2, )",
Expand Down
7 changes: 0 additions & 7 deletions src/WingetIntune/WingetIntune.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@
<PackageReference Include="Microsoft.Graph.Core" Version="3.1.20" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.64.0" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.64.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.12.2" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.12.2" />
<PackageReference Include="Riok.Mapperly" Version="3.6.0" />
<PackageReference Include="SvRooij.ContentPrep" Version="0.1.3-alpha0001" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
Expand Down
242 changes: 114 additions & 128 deletions src/WingetIntune/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,70 +108,6 @@
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "cQQsaviratxNzfGfm+2famoIoXeMvGswPCFQVDKMoIpHb6zinHK4AMNHSckjjeWlLdWnFWLUU+o4tehnzsrbpw==",
"dependencies": {
"Std.UriTemplate": "1.0.5"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "/Yn7s2ysJmtcVaPngvinG8ZuiIeiY4yRFUmdX/wOZCojyFj3c948tQcybD1KcW8Oz+sGA6TF+wUhwStR4Xfjig==",
"dependencies": {
"Azure.Core": "1.42.0",
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "h9uiiysinSJVLDIHM/UK7HK2GKF+4MYGrixP8j+DngCK6U9kwLJg6bYOYTGDtJmlRRr0Z1oIGPoYsLn2PLDOhA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "MtKfAQEzfxZndL05xofNRiU20hj5fgwPQEAL1kujIFH+K/zKjMhHCauDQIHWWIbBBuyGpdnKRfL0mA53ruzvlQ==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Json": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "ZJb5fAuvpnSa8NqhCyGEUlx7agLX+ykyz6xF1egH4pLxhOXG2yMxVgeEc+Kg52ZdI5RBiFAdo0OiTl/H6ajLgg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "NfWpMyKaJM6hMRoebGavN+9TDPwnwzcqnnNZfyds6M5AEli9OSHONkn/71g8QDF1nQAhPiDwAYncQ5hUZjhFMQ==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "R/tjcz8eOhBHFE+xWgBhZDabVg3FYt2kBdVx2/qGutiFTD+U5AITud8iimW68TSHg7qDdh47LsvMuhiaod4uCg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Riok.Mapperly": {
"type": "Direct",
"requested": "[3.6.0, )",
Expand Down Expand Up @@ -309,6 +245,63 @@
"System.IdentityModel.Tokens.Jwt": "8.0.1"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "cQQsaviratxNzfGfm+2famoIoXeMvGswPCFQVDKMoIpHb6zinHK4AMNHSckjjeWlLdWnFWLUU+o4tehnzsrbpw==",
"dependencies": {
"Std.UriTemplate": "1.0.5"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "/Yn7s2ysJmtcVaPngvinG8ZuiIeiY4yRFUmdX/wOZCojyFj3c948tQcybD1KcW8Oz+sGA6TF+wUhwStR4Xfjig==",
"dependencies": {
"Azure.Core": "1.42.0",
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "h9uiiysinSJVLDIHM/UK7HK2GKF+4MYGrixP8j+DngCK6U9kwLJg6bYOYTGDtJmlRRr0Z1oIGPoYsLn2PLDOhA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "qeOOkVw6iB7xbDaFzlvE4x/LTAQ/EeuVHJEl0LwdE1nm9elrLZtQrUW1juwsnFIiTLkyEfR5lebfTK9Wln5iRw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Json": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "ZJb5fAuvpnSa8NqhCyGEUlx7agLX+ykyz6xF1egH4pLxhOXG2yMxVgeEc+Kg52ZdI5RBiFAdo0OiTl/H6ajLgg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "FN6RNDPyOwnVcBvtElHE/C3Eky7RC3GL5//XVC6GbW/2YGCZJdcbATcFpQ7KlWGNSuf31zrS/mltT+dh8yauSA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "0vw3voEjENx2cXBqVFOhOGnqzC9ECBlpYhkEPXr8D+pTBYl8RDPS3N2mVWaib4CASqrwqqKYCksTGVpsnDA8Pw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "7.0.4",
Expand Down Expand Up @@ -513,70 +506,6 @@
"System.Security.Cryptography.ProtectedData": "4.5.0"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "cQQsaviratxNzfGfm+2famoIoXeMvGswPCFQVDKMoIpHb6zinHK4AMNHSckjjeWlLdWnFWLUU+o4tehnzsrbpw==",
"dependencies": {
"Std.UriTemplate": "1.0.5"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "/Yn7s2ysJmtcVaPngvinG8ZuiIeiY4yRFUmdX/wOZCojyFj3c948tQcybD1KcW8Oz+sGA6TF+wUhwStR4Xfjig==",
"dependencies": {
"Azure.Core": "1.42.0",
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "h9uiiysinSJVLDIHM/UK7HK2GKF+4MYGrixP8j+DngCK6U9kwLJg6bYOYTGDtJmlRRr0Z1oIGPoYsLn2PLDOhA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "MtKfAQEzfxZndL05xofNRiU20hj5fgwPQEAL1kujIFH+K/zKjMhHCauDQIHWWIbBBuyGpdnKRfL0mA53ruzvlQ==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Json": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "ZJb5fAuvpnSa8NqhCyGEUlx7agLX+ykyz6xF1egH4pLxhOXG2yMxVgeEc+Kg52ZdI5RBiFAdo0OiTl/H6ajLgg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "NfWpMyKaJM6hMRoebGavN+9TDPwnwzcqnnNZfyds6M5AEli9OSHONkn/71g8QDF1nQAhPiDwAYncQ5hUZjhFMQ==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Direct",
"requested": "[1.12.2, )",
"resolved": "1.12.2",
"contentHash": "R/tjcz8eOhBHFE+xWgBhZDabVg3FYt2kBdVx2/qGutiFTD+U5AITud8iimW68TSHg7qDdh47LsvMuhiaod4uCg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Riok.Mapperly": {
"type": "Direct",
"requested": "[3.6.0, )",
Expand Down Expand Up @@ -760,6 +689,63 @@
"System.IdentityModel.Tokens.Jwt": "8.0.1"
}
},
"Microsoft.Kiota.Abstractions": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "cQQsaviratxNzfGfm+2famoIoXeMvGswPCFQVDKMoIpHb6zinHK4AMNHSckjjeWlLdWnFWLUU+o4tehnzsrbpw==",
"dependencies": {
"Std.UriTemplate": "1.0.5"
}
},
"Microsoft.Kiota.Authentication.Azure": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "/Yn7s2ysJmtcVaPngvinG8ZuiIeiY4yRFUmdX/wOZCojyFj3c948tQcybD1KcW8Oz+sGA6TF+wUhwStR4Xfjig==",
"dependencies": {
"Azure.Core": "1.42.0",
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Http.HttpClientLibrary": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "h9uiiysinSJVLDIHM/UK7HK2GKF+4MYGrixP8j+DngCK6U9kwLJg6bYOYTGDtJmlRRr0Z1oIGPoYsLn2PLDOhA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Form": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "qeOOkVw6iB7xbDaFzlvE4x/LTAQ/EeuVHJEl0LwdE1nm9elrLZtQrUW1juwsnFIiTLkyEfR5lebfTK9Wln5iRw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Json": {
"type": "Transitive",
"resolved": "1.12.2",
"contentHash": "ZJb5fAuvpnSa8NqhCyGEUlx7agLX+ykyz6xF1egH4pLxhOXG2yMxVgeEc+Kg52ZdI5RBiFAdo0OiTl/H6ajLgg==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.12.2"
}
},
"Microsoft.Kiota.Serialization.Multipart": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "FN6RNDPyOwnVcBvtElHE/C3Eky7RC3GL5//XVC6GbW/2YGCZJdcbATcFpQ7KlWGNSuf31zrS/mltT+dh8yauSA==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.Kiota.Serialization.Text": {
"type": "Transitive",
"resolved": "1.11.3",
"contentHash": "0vw3voEjENx2cXBqVFOhOGnqzC9ECBlpYhkEPXr8D+pTBYl8RDPS3N2mVWaib4CASqrwqqKYCksTGVpsnDA8Pw==",
"dependencies": {
"Microsoft.Kiota.Abstractions": "1.11.3"
}
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
"resolved": "7.0.4",
Expand Down
Loading

0 comments on commit 84c88b2

Please sign in to comment.