Skip to content

Commit b79e872

Browse files
fabiocavfabiocav
committed
Updating target framework for all projects and adding missing binding
redirects
1 parent bdf0c61 commit b79e872

30 files changed

+2005
-445
lines changed

‎.nuget/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<packages>
33
<package id="Microsoft.Web.SkipStrongNames" version="1.0.0" />
44
<package id="xunit.MSBuild" version="2.0.0" />
5+
<package id="xunit.runner.console" version="2.3.0" />
56
</packages>

‎WebJobs.Script.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
7777
<Message Text="Restoring NuGet packages..." Importance="High" />
78-
<Exec Command='"$(NuGetExe)" restore WebJobs.Script.sln -PackagesDirectory packages -NonInteractive -Verbosity quiet -ConfigFile .nuget\NuGet.Config' />
78+
<Exec Command='"$(NuGetExe)" restore WebJobs.Script.sln -PackagesDirectory packages -NonInteractive -Verbosity quiet -ConfigFile $(MSBuildThisFileDirectory).nuget\NuGet.Config' />
7979
</Target>
8080

8181
<Target Name="GetBinplace">

‎WebJobs.Script.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.3
4+
VisualStudioVersion = 15.0.26730.16
55
MinimumVisualStudioVersion = 15.0.0.0
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Script", "src\WebJobs.Script\WebJobs.Script.csproj", "{1DC670CD-F42F-4D8F-97BD-0E1AA8221094}"
77
EndProject

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ install:
2525
build_script:
2626
- cmd: msbuild "WebJobs.Script.proj" /target:EnableSkipStrongNames;PackageScriptHost;PackageWebHost;TestBuild /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:Buildnumber=%APPVEYOR_BUILD_NUMBER%;Configuration=Release
2727
test_script:
28-
- cmd: runappveyortests.cmd
28+
- ps: .\runappveyortests.ps1
2929
artifacts:
3030
- path: bin\Packages\*.zip
3131
name: Runtime

‎runappveyortests.cmd‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎runappveyortests.ps1‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
$exitCode = 0;
2+
3+
function CheckExitCode([string] $step,[int] $currentCode)
4+
{
5+
if ($LASTEXITCODE -ne 0)
6+
{
7+
Write-Host "Step '$step' failed" -ForegroundColor Red
8+
return 1
9+
}
10+
11+
return $currentCode;
12+
}
13+
14+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.dll" -appveyor
15+
$exitCode = CheckExitCode("Unit tests", $exitCode)
16+
17+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Scaling.Tests\bin\Release\Microsoft.Azure.WebJobs.Script.Scaling.Tests.dll" -appveyor
18+
$exitCode = CheckExitCode("Scaling tests", $exitCode)
19+
20+
.\runNodeTests.cmd
21+
$exitCode = CheckExitCode("Node tests", $exitCode)
22+
23+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -notrait "Category=E2E"
24+
$exitCode = CheckExitCode("Non-E2E tests", $exitCode)
25+
26+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=CSharpEndToEndTests"
27+
$exitCode = CheckExitCode("CSharpEndToEndTests tests", $exitCode)
28+
29+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=NodeEndToEndTests"
30+
$exitCode = CheckExitCode("NodeEndToEndTests tests", $exitCode)
31+
32+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=BashEndToEndTests"
33+
$exitCode = CheckExitCode("BashEndToEndTests tests", $exitCode)
34+
35+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=DirectLoadEndToEndTests"
36+
$exitCode = CheckExitCode("DirectLoadEndToEndTests tests", $exitCode)
37+
38+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=FSharpEndToEndTests"
39+
$exitCode = CheckExitCode("FSharpEndToEndTests tests", $exitCode)
40+
41+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=PhpEndToEndTests"
42+
$exitCode = CheckExitCode("PhpEndToEndTests tests", $exitCode)
43+
44+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=PowerShellEndToEndTests"
45+
$exitCode = CheckExitCode("PowerShellEndToEndTests tests", $exitCode)
46+
47+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=PythonEndToEndTests"
48+
$exitCode = CheckExitCode("PythonEndToEndTests tests", $exitCode)
49+
50+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=RawAssemblyEndToEndTests"
51+
$exitCode = CheckExitCode("RawAssemblyEndToEndTests tests", $exitCode)
52+
53+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.x86.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=SamplesEndToEndTests"
54+
$exitCode = CheckExitCode("SamplesEndToEndTests tests", $exitCode)
55+
56+
& $env:APPVEYOR_BUILD_FOLDER\packages\xunit.runner.console.2.3.0\tools\net452\xunit.console.exe "$env:APPVEYOR_BUILD_FOLDER\test\WebJobs.Script.Tests.Integration\bin\Release\Microsoft.Azure.WebJobs.Script.Tests.Integration.dll" -trait "E2E=NodeEndToEndTests"
57+
$exitCode = CheckExitCode("NodeEndToEndTests tests (x64)", $exitCode)
58+
59+
exit $exitCode

‎src/Packages/Packages.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<SkipCopyBuildProduct>true</SkipCopyBuildProduct>
77
<ProjectGuid>{34AB8F63-18DE-4E0D-B21C-15E33B091634}</ProjectGuid>
8-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
8+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
99
<NuGetPackageImportStamp>
1010
</NuGetPackageImportStamp>
1111
<TargetFrameworkProfile />
@@ -40,7 +40,9 @@
4040
<None Include="..\..\tools\NuGetProj.settings.targets">
4141
<Link>NuGetProj.settings.targets</Link>
4242
</None>
43-
<None Include="app.config" />
43+
<None Include="app.config">
44+
<SubType>Designer</SubType>
45+
</None>
4446
<None Include="packages.config" />
4547
<None Include="tools\install.ps1" />
4648
</ItemGroup>

‎src/Packages/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

0 commit comments

Comments
 (0)