Azure
/
azure-functions-vs-build-sdk
зеркало из https://github.com/Azure/azure-functions-vs-build-sdk.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update Newtonsoft.Json to 11.0.2

This commit is contained in:
Ahmed ElSayed 2018-06-20 15:30:26 -07:00
Родитель 0fb67f07b7
Коммит c0be790799
11 изменённых файлов: 16 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
pack/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj
Просмотреть файл

@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3.0.0-beta5,3.1.0)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="[3.0.0-beta5,3.1.0)" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="[3.0.0-beta5,3.1.0)" />

2
sample/FunctionAppNETFramework/UnitTestProject1/UnitTestProject1.csproj
Просмотреть файл

@ -39,7 +39,7 @@
<ItemGroup>
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[2.1.0-beta1]" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="[2.1.0-beta1]" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="[1.0.0-beta1]" />

2
sample/FunctionAppNETStandard/UnitTestNETFramework/UnitTestNETFramework.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
<PackageReference Include="Microsoft.Azure.WebJobs" Version="[3.0.0-beta4]" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="[3.0.0-beta4]" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="[3.0.0-beta4]" />

2
sample/FunctionAppNETStandard/UnitTestProject2/UnitTestProject2.csproj
Просмотреть файл

@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
</ItemGroup>
<ItemGroup>

2
sample/FunctionAppNETStandard/XUnitTestProject1/XUnitTestProject1.csproj
Просмотреть файл

@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
</ItemGroup>
<ItemGroup>

6
src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
@ -15,7 +15,9 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="Newtonsoft.Json" Version="[10.0.3]" />
<PackageReference Include="Newtonsoft.Json" Version="[11.0.2]" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

4
src/Microsoft.NET.Sdk.Functions.MSBuild/Microsoft.NET.Sdk.Functions.MSBuild.csproj
Просмотреть файл

@ -14,14 +14,14 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.1012" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.1012" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<ItemGroup>

2
src/Microsoft.NET.Sdk.Functions.MSBuild/Tasks/ZipDeployTask.cs
Просмотреть файл

@ -33,7 +33,7 @@ namespace Microsoft.NET.Sdk.Functions.Tasks
}
}
private async System.Threading.Tasks.Task<bool> ZipDeployAsync(string zipToPublishPath, string userName, string password, string publishUrl, IHttpClient client)
public async System.Threading.Tasks.Task<bool> ZipDeployAsync(string zipToPublishPath, string userName, string password, string publishUrl, IHttpClient client)
{
if (!File.Exists(ZipToPublishPath) || client == null)
{

4
test/Microsoft.NET.Sdk.Functions.Generator.Tests/Microsoft.NET.Sdk.Functions.Generator.Tests.csproj
Просмотреть файл

@ -131,8 +131,8 @@
<Reference Include="NCrontab, Version=3.2.20120.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\ncrontab.3.3.0\lib\net35\NCrontab.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NSubstitute, Version=2.0.3.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
<HintPath>..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll</HintPath>

2
test/Microsoft.NET.Sdk.Functions.Generator.Tests/app.config
Просмотреть файл

@ -8,7 +8,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="FluentAssertions.Core" publicKeyToken="33f2691a05b67b6a" culture="neutral" />

2
test/Microsoft.NET.Sdk.Functions.Generator.Tests/packages.config
Просмотреть файл

@ -30,7 +30,7 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
<package id="ncrontab" version="3.3.0" targetFramework="net46" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="net46" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="NSubstitute" version="2.0.3" targetFramework="net46" />
<package id="System.AppContext" version="4.3.0" targetFramework="net46" />
<package id="System.Collections" version="4.3.0" targetFramework="net46" />