Skip to content

Commit ef016dc

Browse files
rzanderrzander
committed
update to latest sccmclictr.automation.dll
1 parent 355b7d8 commit ef016dc

19 files changed

Lines changed: 46 additions & 46 deletions

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,3 +327,5 @@ Customization.dll.config
327327
Plugin_*.dll
328328
Customization/*.cs
329329
MSI_Setup/
330+
/SCCMCliCtrWPF/SCCMCliCtrWPF/Newtonsoft.Json.dll
331+
/SCCMCliCtrWPF/SCCMCliCtrWPF/Serilog.dll

‎Plugins/Plugin_RemoteTools/Plugin_CMRemote.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AgentActionTools</RootNamespace>
1111
<AssemblyName>Plugin_CMRemote</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -50,8 +50,8 @@
5050
<Reference Include="Customization">
5151
<HintPath>..\..\Customization\bin\Debug\Customization.dll</HintPath>
5252
</Reference>
53-
<Reference Include="sccmclictr.automation, Version=1.0.0.36, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>packages\sccmclictrlib.1.0.0.36\lib\net47\sccmclictr.automation.dll</HintPath>
53+
<Reference Include="sccmclictr.automation, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>packages\sccmclictrlib.1.0.1\lib\net48\sccmclictr.automation.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System" />
5757
<Reference Include="System.Data" />
@@ -108,7 +108,7 @@
108108
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109109
<PropertyGroup>
110110
<PostBuildEvent>if "$(ConfigurationName)"=="Debug" GOTO end
111-
"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\Bin\SignTool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)"
111+
"C:\tools\signtool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)"
112112
:end
113113
</PostBuildEvent>
114114
</PropertyGroup>

‎Plugins/Plugin_RemoteTools/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("Zander - Tools")]
1414
[assembly: AssemblyProduct("SCCMCliCtrWPF")]
15-
[assembly: AssemblyCopyright("Copyright © 2021 by Roger Zander")]
15+
[assembly: AssemblyCopyright("Copyright © 2023 by Roger Zander")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.1.4")]
55-
[assembly: AssemblyFileVersion("1.0.1.4")]
54+
[assembly: AssemblyVersion("1.0.1.5")]
55+
[assembly: AssemblyFileVersion("1.0.1.5")]

‎Plugins/Plugin_RemoteTools/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Plugins/Plugin_RemoteTools/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
</setting>
1919
</AgentActionTools.Properties.Settings>
2020
</applicationSettings>
21-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
21+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Plugins/Plugin_RemoteTools/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="sccmclictrlib" version="1.0.0.36" targetFramework="net472" />
3+
<package id="sccmclictrlib" version="1.0.1" targetFramework="net48" />
44
</packages>

‎Plugins/Plugin_RuckZuck/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
<configuration>
33
<configSections>
44
</configSections>
5-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
5+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Plugins/Plugin_RuckZuck/InstallSwPanel.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public InstallSwPanel()
4848
{
4949
RZScan oSCAN = new RZScan(false, false);
5050

51-
Task.Run(() => oSCAN.GetSWRepository()).Wait();
51+
Task.Run(() => oSCAN.GetSWRepositoryAsync(new CancellationTokenSource(15000).Token)).Wait();
5252

5353
lAllSoftware = oSCAN.SoftwareRepository;
5454

@@ -344,7 +344,7 @@ private void btInstall_Click(object sender, RoutedEventArgs e)
344344
//Check if installed
345345
if ((bool)oAgent.Client.GetObjectsFromPS(DT.PSDetection, true, new TimeSpan(0, 0, 0))[0].BaseObject)
346346
{
347-
RZRestAPIv2.Feedback(DT.ProductName, DT.ProductVersion, DT.Manufacturer, DT.Architecture, "true", "SCCMCliCtr", "Ok...").ConfigureAwait(false);
347+
RZRestAPIv2.FeedbackAsync(DT.ProductName, DT.ProductVersion, DT.Manufacturer, DT.Architecture, "true", "SCCMCliCtr", "Ok...").ConfigureAwait(false);
348348
MessageBox.Show("Software installed successfully.", "Installation Status:", MessageBoxButton.OK, MessageBoxImage.Information);
349349
bInstalled = true;
350350
continue;

‎Plugins/Plugin_RuckZuck/Plugin_RuckZuck.csproj‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AgentActionTools</RootNamespace>
1111
<AssemblyName>Plugin_RuckZuck</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
@@ -51,8 +51,15 @@
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\..\Customization\bin\Debug\Customization.dll</HintPath>
5353
</Reference>
54-
<Reference Include="sccmclictr.automation, Version=1.0.0.36, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>packages\sccmclictrlib.1.0.0.36\lib\net47\sccmclictr.automation.dll</HintPath>
54+
<Reference Include="Microsoft.CSharp" />
55+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
56+
<HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
57+
</Reference>
58+
<Reference Include="sccmclictr.automation, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>packages\sccmclictrlib.1.0.1\lib\net48\sccmclictr.automation.dll</HintPath>
60+
</Reference>
61+
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
62+
<HintPath>packages\Serilog.2.12.0\lib\net47\Serilog.dll</HintPath>
5663
</Reference>
5764
<Reference Include="System" />
5865
<Reference Include="System.Data" />
@@ -65,6 +72,7 @@
6572
</Reference>
6673
<Reference Include="System.Net.Http" />
6774
<Reference Include="System.Runtime.Serialization" />
75+
<Reference Include="System.Web" />
6876
<Reference Include="System.Web.Extensions" />
6977
<Reference Include="System.Web.Services" />
7078
<Reference Include="System.Windows.Controls.Ribbon" />
@@ -149,7 +157,7 @@
149157
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
150158
<PropertyGroup>
151159
<PostBuildEvent>if "$(ConfigurationName)"=="Debug" GOTO end
152-
"C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\Bin\SignTool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)"
160+
"C:\tools\signtool.exe" sign /i "Sectigo RSA Code Signing CA" /n "Zander - Tools" /t "http://timestamp.comodoca.com/authenticode" /q "$(TargetPath)"
153161
:end
154162
</PostBuildEvent>
155163
</PropertyGroup>

‎Plugins/Plugin_RuckZuck/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("Zander - Tools")]
1414
[assembly: AssemblyProduct("SCCMCliCtrWPF")]
15-
[assembly: AssemblyCopyright("Copyright © 2021 by Roger Zander")]
15+
[assembly: AssemblyCopyright("Copyright © 2023 by Roger Zander")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.7.2.2")]
55-
[assembly: AssemblyFileVersion("1.7.2.2")]
54+
[assembly: AssemblyVersion("1.7.2.3")]
55+
[assembly: AssemblyFileVersion("1.7.2.3")]

0 commit comments

Comments
 (0)