Skip to content

Commit ab4e0df

Browse files
safihamidsafihamid
committed
Update to latest Proxy.Client.Contract version
1 parent 9c09e69 commit ab4e0df

File tree

10 files changed

+22
-42
lines changed

10 files changed

+22
-42
lines changed

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.7.2-alpha\lib\net45\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>
173173
<Private>True</Private>
174174
</Reference>
175-
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.6, Culture=neutral, processorArchitecture=MSIL">
176-
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.0.6\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
175+
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
176+
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.1.1\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
177177
<SpecificVersion>False</SpecificVersion>
178178
</Reference>
179179
<Reference Include="Microsoft.Azure.Documents.ChangeFeedProcessor, Version=1.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/WebJobs.Script.WebHost/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<package id="Microsoft.AspNetCore.Http.Features" version="1.0.2" targetFramework="net46" />
3838
<package id="Microsoft.AspNetCore.WebUtilities" version="1.0.0" targetFramework="net46" />
3939
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net46" />
40-
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.0.6" targetFramework="net46" />
40+
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.1.1" targetFramework="net46" />
4141
<package id="Microsoft.Azure.DocumentDB" version="1.13.2" targetFramework="net46" />
4242
<package id="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" version="1.0.0" targetFramework="net46" />
4343
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net46" />

‎src/WebJobs.Script/WebJobs.Script.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.7.2-alpha\lib\net45\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
82+
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.1.1\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
84+
<SpecificVersion>False</SpecificVersion>
85+
</Reference>
8286
<Reference Include="Microsoft.Azure.Documents.ChangeFeedProcessor, Version=1.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8387
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.ChangeFeedProcessor.1.0.0\lib\net45\Microsoft.Azure.Documents.ChangeFeedProcessor.dll</HintPath>
8488
</Reference>
8589
<Reference Include="Microsoft.Azure.Documents.Client, Version=1.13.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8690
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.1.13.2\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
8791
</Reference>
88-
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.6, Culture=neutral, processorArchitecture=MSIL">
89-
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.0.6\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
90-
<SpecificVersion>False</SpecificVersion>
91-
</Reference>
9292
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9393
<HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
9494
</Reference>

‎src/WebJobs.Script/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
1313
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
1414
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net46" />
15-
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.0.6" targetFramework="net46" />
15+
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.1.1" targetFramework="net46" />
1616
<package id="Microsoft.Azure.DocumentDB" version="1.13.2" targetFramework="net46" />
1717
<package id="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" version="1.0.0" targetFramework="net46" />
1818
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net46" />

‎test/WebJobs.Script.Tests.Integration/ProxyEndToEndTests.cs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,9 @@ private static ProxyClientExecutor GetMockProxyClient()
6161
var proxyClient = new Mock<IProxyClient>();
6262

6363
ProxyData proxyData = new ProxyData();
64-
proxyData.Routes.Add(new Routes()
65-
{
66-
Methods = new[] { HttpMethod.Get, HttpMethod.Post },
67-
Name = "test",
68-
UrlTemplate = "/myproxy"
69-
});
64+
proxyData.Routes.Add(new Routes("/myproxy", "test", new[] { HttpMethod.Get, HttpMethod.Post }));
7065

71-
proxyData.Routes.Add(new Routes()
72-
{
73-
Methods = new[] { HttpMethod.Get },
74-
Name = "localFunction",
75-
UrlTemplate = "/mymockhttp"
76-
});
66+
proxyData.Routes.Add(new Routes("/mymockhttp", "localFunction", new[] { HttpMethod.Get }));
7767

7868
proxyClient.Setup(p => p.GetProxyData()).Returns(proxyData);
7969

‎test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@
100100
<Reference Include="Microsoft.Azure.ApiHub.Sdk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
101101
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.7.2-alpha\lib\net45\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>
102102
</Reference>
103+
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
104+
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.1.1\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
105+
<SpecificVersion>False</SpecificVersion>
106+
</Reference>
103107
<Reference Include="Microsoft.Azure.Documents.ChangeFeedProcessor, Version=1.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104108
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.ChangeFeedProcessor.1.0.0\lib\net45\Microsoft.Azure.Documents.ChangeFeedProcessor.dll</HintPath>
105109
</Reference>
@@ -392,10 +396,6 @@
392396
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
393397
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
394398
</Reference>
395-
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.6, Culture=neutral, processorArchitecture=MSIL">
396-
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.0.6\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
397-
<SpecificVersion>False</SpecificVersion>
398-
</Reference>
399399
</ItemGroup>
400400
<ItemGroup>
401401
<Compile Include="ApiHubTestHelper.cs" />

‎test/WebJobs.Script.Tests.Integration/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<package id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.2" targetFramework="net46" />
2222
<package id="Microsoft.AspNetCore.Http.Features" version="1.0.2" targetFramework="net46" />
2323
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net46" />
24-
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.0.6" targetFramework="net46" />
24+
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.1.1" targetFramework="net46" />
2525
<package id="Microsoft.Azure.DocumentDB" version="1.13.2" targetFramework="net46" />
2626
<package id="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" version="1.0.0" targetFramework="net46" />
2727
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net46" />

‎test/WebJobs.Script.Tests/Description/Proxy/ProxyFunctionDescriptorProviderTests.cs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,9 @@ private ProxyClientExecutor GetMockProxyClient()
4848
var proxyClient = new Mock<IProxyClient>();
4949

5050
ProxyData proxyData = new ProxyData();
51-
proxyData.Routes.Add(new Routes()
52-
{
53-
Methods = new[] { HttpMethod.Get, HttpMethod.Post },
54-
Name = "test",
55-
UrlTemplate = "/myproxy"
56-
});
51+
proxyData.Routes.Add(new Routes("/myproxy", "test", new[] { HttpMethod.Get, HttpMethod.Post }));
5752

58-
proxyData.Routes.Add(new Routes()
59-
{
60-
Methods = new[] { HttpMethod.Get },
61-
Name = "localFunction",
62-
UrlTemplate = "/mymockhttp"
63-
});
53+
proxyData.Routes.Add(new Routes("/mymockhttp", "localFunction", new[] { HttpMethod.Get }));
6454

6555
proxyClient.Setup(p => p.GetProxyData()).Returns(proxyData);
6656

‎test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@
110110
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.7.2-alpha\lib\net45\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113+
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
114+
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.1.1\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
115+
<SpecificVersion>False</SpecificVersion>
116+
</Reference>
113117
<Reference Include="Microsoft.Azure.Documents.ChangeFeedProcessor, Version=1.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
114118
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.ChangeFeedProcessor.1.0.0\lib\net45\Microsoft.Azure.Documents.ChangeFeedProcessor.dll</HintPath>
115119
</Reference>
@@ -450,10 +454,6 @@
450454
<HintPath>..\..\packages\System.IO.Abstractions.TestingHelpers.2.0.0.140\lib\net40\System.IO.Abstractions.TestingHelpers.dll</HintPath>
451455
<Private>True</Private>
452456
</Reference>
453-
<Reference Include="Microsoft.Azure.AppService.Proxy.Client.Contract, Version=0.3.0.6, Culture=neutral, processorArchitecture=MSIL">
454-
<HintPath>..\..\packages\Microsoft.Azure.AppService.Proxy.Client.Contract.0.3.0.6\lib\net46\Microsoft.Azure.AppService.Proxy.Client.Contract.dll</HintPath>
455-
<SpecificVersion>False</SpecificVersion>
456-
</Reference>
457457
</ItemGroup>
458458
<ItemGroup Condition="'$(EnablePowershell)'=='True'">
459459
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎test/WebJobs.Script.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<package id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.2" targetFramework="net46" />
2323
<package id="Microsoft.AspNetCore.Http.Features" version="1.0.2" targetFramework="net46" />
2424
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net46" />
25-
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.0.6" targetFramework="net46" />
25+
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.1.1" targetFramework="net46" />
2626
<package id="Microsoft.Azure.DocumentDB" version="1.13.2" targetFramework="net46" />
2727
<package id="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" version="1.0.0" targetFramework="net46" />
2828
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net46" />

0 commit comments

Comments
 (0)