Merge pull request #119 from UiPath/fix/net47

.Net 4.7

Author: rusanu

.vsts-ci.yml

@@ -36,7 +36,7 @@ steps:
   inputs:
     scriptType: "inlineScript"
     inlineScript: |
-      $buildNumber = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$($ENV:BUILD_SOURCESDIRECTORY)\Output\$($ENV:BUILDCONFIGURATION)\net461\UiPath.PowerShell.dll").ProductVersion
+      $buildNumber = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$($ENV:BUILD_SOURCESDIRECTORY)\Output\$($ENV:BUILDCONFIGURATION)\net472\UiPath.PowerShell.dll").ProductVersion
       Write-Host "##vso[build.updatebuildnumber]$buildNumber"
 
 - task: NuGetCommand@2

UiPath.PowerShell.Tests/UiPath.PowerShell.Tests.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
+        <TargetFramework>net472</TargetFramework>
         <OutputPath>$(SolutionDir)\Output\$(Configuration)</OutputPath>
         <Deterministic>False</Deterministic>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Properties\GlobalAssemblyInfo.cs">

UiPath.PowerShell.nuspec

@@ -12,10 +12,11 @@
     <developmentDependency>false</developmentDependency>
     <description>An easy to use PowerShell API client for UiPath Orchestrator</description>
     <copyright>UiPath</copyright>
-    <tags>UiPath Orchestrator PowerShell API client </tags>
+    <tags>PSModule</tags>
   </metadata>
   <files>
-    <file src="Output\Release\net461\*.*" target="lib\net461" exclude="**\*Test*;**\*.psd1" />
-    <file src="Output\Release\net461\UiPath.PowerShell.psd1" target="" exclude="" />
+    <file src="Output\Release\net472\*.*" target="lib\net472" exclude="**\*Test*;**\*.psd1;**\*.ps1" />
+    <file src="Output\Release\net472\UiPath.PowerShell.psd1" target="" exclude="" />
+    <file src="Output\Release\net472\UiPath.BindingResolve.ps1" target="tools" exclude="" />
   </files>
 </package>

UiPath.PowerShell/UiPath.BindingResolve.ps1

@@ -0,0 +1,22 @@
+$OnAssemblyResolve = [System.ResolveEventHandler] {
+  param($sender, $e)
+
+
+  if ($e.Name.StartsWith("System.Net.Http,"))
+  {
+    [system.diagnostics.debug]::WriteLine("Binding redirect $($e.Name) resolved to $($script:httpNet.Location)")
+    return $script:httpNet
+  }
+
+  return $null
+}
+
+trap [System.Exception] { [system.diagnostics.debug]::WriteLine("Exception: $_") }
+
+if ($env:UIPATH_POWERSHELL_SKIP_BINDING_REDIRECT -ne $true)
+{
+  Write-Verbose "Installing assembly resolve binding redirect callback"
+  # See https://github.com/dotnet/runtime/issues/20777#issuecomment-338418610 
+  $script:httpNet = [reflection.assembly]::Load("System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")
+  [System.AppDomain]::CurrentDomain.add_AssemblyResolve($OnAssemblyResolve)
+}

UiPath.PowerShell/UiPath.PowerShell.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <OutputPath>$(SolutionDir)\Output\$(Configuration)</OutputPath>
       <Deterministic>False</Deterministic>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DocumentationFile>$(OutDir)\UiPath.PowerShell\UiPath.PowerShell.xml</DocumentationFile>
       <NoWarn>1701;1702;CS1591;CS0618</NoWarn>
+      <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
       <PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-06">
@@ -33,6 +34,9 @@
     <None Include="UiPath.PowerShell.psd1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="UiPath.BindingResolve.ps1">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\UiPath.Web.Client\UiPath.Web.Client.csproj" />

UiPath.PowerShell/UiPath.PowerShell.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Script module or binary module file associated with this manifest.
-RootModule = 'lib\net461\UiPath.PowerShell.dll'
+RootModule = 'lib\net472\UiPath.PowerShell.dll'
 
 # Version number of this module.
 ModuleVersion = '$(UiPathFileVersion)'
@@ -57,7 +57,7 @@ CLRVersion = '4.0'
 #RequiredAssemblies = @()
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+ScriptsToProcess = @('.\tools\UiPath.BindingResolve.ps1')
 
 # Type files (.ps1xml) to be loaded when importing this module
 # TypesToProcess = @()

UiPath.PowerShell/Util/BindingResolver.cs

@@ -10,7 +10,6 @@ namespace UiPath.PowerShell.Util
 {
     public abstract class UiPathCmdlet : PSCmdlet
     {
-        private bool Ignored = BindingResolver.Ignored;
         private bool ProtocolIgnored = SecurityProtocolFix.Ignored;
 
         private static RestVerboseTracer VerboseTracer { get; set; }

UiPath.PowerShell/Util/UiPathCmdlet.cs

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <OutputPath>$(SolutionDir)\Output\$(Configuration)</OutputPath>
       <Deterministic>False</Deterministic>
       <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoWarn>1701;1702;CS1591;CS0618</NoWarn>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />