Update to fwk .net 4.5.2 + remove paket auto-detect

2017-04-12 23:00:10 +02:00
parent bc7db6b028
commit 3efaf3dd22
6 changed files with 72 additions and 83 deletions
@@ -110,7 +110,7 @@
  <UsingTask AssemblyFile="packages\WixSharp.1.0.22.3\build\SetEnvVar.dll" TaskName="SetEnvVar" />
  <Import Project="..\.paket\paket.targets" />
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="Microsoft.Deployment.WindowsInstaller">
          <HintPath>..\packages\WixSharp\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
@@ -110,7 +110,7 @@
  -->
  <Import Project="..\.paket\paket.targets" />
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="System.Net.Http.Formatting">
          <HintPath>..\packages\Microsoft.AspNet.WebApi.Client\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -121,7 +121,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="System.Web.Http">
          <HintPath>..\packages\Microsoft.AspNet.WebApi.Core\lib\net45\System.Web.Http.dll</HintPath>
@@ -132,7 +132,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="Microsoft.TeamFoundation.Build.Client">
          <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient\lib\net45\Microsoft.TeamFoundation.Build.Client.dll</HintPath>
@@ -168,7 +168,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="Microsoft.TeamFoundation.Common">
          <HintPath>..\packages\Microsoft.VisualStudio.Services.Client\lib\net45\Microsoft.TeamFoundation.Common.dll</HintPath>
@@ -189,7 +189,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="Microsoft.VisualStudio.Services.Client">
          <HintPath>..\packages\Microsoft.VisualStudio.Services.InteractiveClient\lib\net45\Microsoft.VisualStudio.Services.Client.dll</HintPath>
@@ -200,16 +200,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="Newtonsoft.Json">
-          <HintPath>..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="Newtonsoft.Json">
          <HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -219,5 +210,16 @@
      </ItemGroup>
    </When>
  </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
+      <ItemGroup>
+        <Reference Include="System.IdentityModel.Tokens.Jwt">
+          <HintPath>..\packages\System.IdentityModel.Tokens.Jwt\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
  <Import Project="..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\Microsoft.TeamFoundationServer.ExtendedClient.targets" Condition="Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient\build\Microsoft.TeamFoundationServer.ExtendedClient.targets')" Label="Paket" />
 </Project>
@@ -290,7 +290,7 @@
  -->
  <Import Project="..\.paket\paket.targets" />
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="LibGit2Sharp">
          <HintPath>..\packages\LibGit2Sharp\lib\net40\LibGit2Sharp.dll</HintPath>
@@ -301,16 +301,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="NLog">
-          <HintPath>..\packages\NLog\lib\net40\NLog.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="NLog">
          <HintPath>..\packages\NLog\lib\net45\NLog.dll</HintPath>
@@ -196,7 +196,7 @@
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <PropertyGroup>
        <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio</__paket__xunit_runner_visualstudio_props>
      </PropertyGroup>
@@ -219,7 +219,7 @@
  -->
  <Import Project="..\.paket\paket.targets" />
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="LibGit2Sharp">
          <HintPath>..\packages\LibGit2Sharp\lib\net40\LibGit2Sharp.dll</HintPath>
@@ -230,16 +230,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="NLog">
-          <HintPath>..\packages\NLog\lib\net40\NLog.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="NLog">
          <HintPath>..\packages\NLog\lib\net45\NLog.dll</HintPath>
@@ -250,7 +241,7 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="xunit.abstractions">
          <HintPath>..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll</HintPath>
@@ -261,10 +252,10 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="xunit.assert">
-          <HintPath>..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
+          <HintPath>..\packages\xunit.assert\lib\netstandard1.1\xunit.assert.dll</HintPath>
          <Private>True</Private>
          <Paket>True</Paket>
        </Reference>
@@ -272,10 +263,10 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="xunit.core">
-          <HintPath>..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
+          <HintPath>..\packages\xunit.extensibility.core\lib\netstandard1.1\xunit.core.dll</HintPath>
          <Private>True</Private>
          <Paket>True</Paket>
        </Reference>
@@ -283,10 +274,10 @@
    </When>
  </Choose>
  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
      <ItemGroup>
        <Reference Include="xunit.execution.desktop">
-          <HintPath>..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll</HintPath>
+          <HintPath>..\packages\xunit.extensibility.execution\lib\net452\xunit.execution.desktop.dll</HintPath>
          <Private>True</Private>
          <Paket>True</Paket>
        </Reference>
@@ -1,4 +1,4 @@
-framework: auto-detect
+framework: net452
 source https://www.nuget.org/api/v2/

 //If you plan to update this file, you must first absolutly read our documentation on the subject
@@ -8,8 +8,8 @@ source https://www.nuget.org/api/v2/
 nuget nlog
 nuget NuGet.CommandLine
 nuget LibGit2Sharp
-nuget Microsoft.TeamFoundationServer.Client
-nuget Microsoft.TeamFoundationServer.ExtendedClient
+nuget Microsoft.TeamFoundationServer.Client ~> 14.0
+nuget Microsoft.TeamFoundationServer.ExtendedClient ~> 14.0
 nuget WixSharp 1.0.22.3 framework: >= net40
 nuget xunit
 nuget xunit.assert
@@ -1,18 +1,22 @@
-FRAMEWORK: NET40, NET45
+FRAMEWORK: NET452
 NUGET
  remote: https://www.nuget.org/api/v2
    LibGit2Sharp (0.23.1)
      LibGit2Sharp.NativeBinaries (1.0.164)
    LibGit2Sharp.NativeBinaries (1.0.164)
    Microsoft.AspNet.WebApi.Client (5.2.3)
-      Newtonsoft.Json (>= 6.0.4) - framework: net45
+      Newtonsoft.Json (>= 6.0.4)
    Microsoft.AspNet.WebApi.Core (5.2.3)
      Microsoft.AspNet.WebApi.Client (>= 5.2.3)
-    Microsoft.IdentityModel.Clients.ActiveDirectory (3.13.5)
+    Microsoft.IdentityModel.Clients.ActiveDirectory (3.13.9)
+    Microsoft.IdentityModel.Logging (1.1.3)
+    Microsoft.IdentityModel.Tokens (5.1.3)
+      Microsoft.IdentityModel.Logging (>= 1.1.3)
+      Newtonsoft.Json (>= 9.0.1)
    Microsoft.TeamFoundationServer.Client (14.102)
-      Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45
-      Microsoft.VisualStudio.Services.Client (14.102) - framework: net45
-      Newtonsoft.Json (>= 6.0.8) - framework: net45
+      Microsoft.AspNet.WebApi.Client (>= 5.2.2)
+      Microsoft.VisualStudio.Services.Client (14.102)
+      Newtonsoft.Json (>= 6.0.8)
    Microsoft.TeamFoundationServer.ExtendedClient (14.102)
      Microsoft.AspNet.WebApi.Client (>= 5.2.2)
      Microsoft.AspNet.WebApi.Core (>= 5.2.2)
@@ -23,34 +27,35 @@ NUGET
      Newtonsoft.Json (>= 6.0.8)
      System.IdentityModel.Tokens.Jwt (>= 4.0)
    Microsoft.VisualStudio.Services.Client (14.102)
-      Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45
-      Newtonsoft.Json (>= 6.0.8) - framework: net45
+      Microsoft.AspNet.WebApi.Client (>= 5.2.2)
+      Newtonsoft.Json (>= 6.0.8)
    Microsoft.VisualStudio.Services.InteractiveClient (14.102)
-      Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45
-      Microsoft.IdentityModel.Clients.ActiveDirectory (>= 2.16.204221202) - framework: net45
-      Microsoft.VisualStudio.Services.Client (14.102) - framework: net45
-      Newtonsoft.Json (>= 6.0.8) - framework: net45
-      System.IdentityModel.Tokens.Jwt (>= 4.0) - framework: net45
-      WindowsAzure.ServiceBus (>= 2.5.1) - framework: net45
+      Microsoft.AspNet.WebApi.Client (>= 5.2.2)
+      Microsoft.IdentityModel.Clients.ActiveDirectory (>= 2.16.204221202)
+      Microsoft.VisualStudio.Services.Client (14.102)
+      Newtonsoft.Json (>= 6.0.8)
+      System.IdentityModel.Tokens.Jwt (>= 4.0)
+      WindowsAzure.ServiceBus (>= 2.5.1)
    MSBuildTasks (1.4.0.45)
-    Newtonsoft.Json (9.0.1)
-    NLog (4.3.10)
-    NuGet.CommandLine (3.4.3)
-    System.IdentityModel.Tokens.Jwt (5.0)
-    WindowsAzure.ServiceBus (3.4) - framework: net45
+    Newtonsoft.Json (10.0.2)
+    NLog (4.4.5)
+    NuGet.CommandLine (3.5)
+    System.IdentityModel.Tokens.Jwt (5.1.3)
+      Microsoft.IdentityModel.Tokens (>= 5.1.3)
+    WindowsAzure.ServiceBus (4.0)
    WixSharp (1.0.22.3)
-    xunit (2.1)
-      xunit.assert (2.1)
-      xunit.core (2.1)
-    xunit.abstractions (2.0) - framework: net45
-    xunit.assert (2.1)
-    xunit.core (2.1)
-      xunit.extensibility.core (2.1) - framework: net45
-      xunit.extensibility.execution (2.1) - framework: net45
-    xunit.extensibility.core (2.1) - framework: net45
-      xunit.abstractions (2.0)
-    xunit.extensibility.execution (2.1) - framework: net45
-      xunit.extensibility.core (2.1) - framework: net45
-    xunit.runner.console (2.1)
-    xunit.runner.msbuild (2.1)
-    xunit.runner.visualstudio (2.1)
+    xunit (2.2)
+      xunit.assert (2.2)
+      xunit.core (2.2)
+    xunit.abstractions (2.0.1)
+    xunit.assert (2.2)
+    xunit.core (2.2)
+      xunit.extensibility.core (2.2)
+      xunit.extensibility.execution (2.2)
+    xunit.extensibility.core (2.2)
+      xunit.abstractions (>= 2.0.1)
+    xunit.extensibility.execution (2.2)
+      xunit.extensibility.core (2.2)
+    xunit.runner.console (2.2)
+    xunit.runner.msbuild (2.2)
+    xunit.runner.visualstudio (2.2)