зеркало из https://github.com/microsoft/AMBROSIA.git
Merge branch 'master' of github.com:Microsoft/AMBROSIA
This commit is contained in:
Коммит
5597cc8bd6
|
@ -15,6 +15,7 @@
|
|||
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading">
|
||||
<Version>15.8.168</Version>
|
||||
</PackageReference>
|
||||
|
@ -25,11 +26,13 @@
|
|||
<PackageReference Include="Remote.Linq">
|
||||
<Version>5.8.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives">
|
||||
<Version>4.3.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage">
|
||||
<Version>9.3.2</Version>
|
||||
<Version>9.3.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="CRA">
|
||||
<Version>2018.11.5.1</Version>
|
||||
|
@ -43,6 +46,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
|
|
|
@ -17,19 +17,28 @@
|
|||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AmbrosiaLibCS" Version="2018.12.10.1" />
|
||||
<PackageReference Include="AmbrosiaLibCS" Version="2018.12.12.1" />
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives">
|
||||
<Version>4.3.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
<PackageReference Update="Microsoft.NETCore.App=" Version="2.0.0=" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Update="app.config">
|
||||
|
|
|
@ -17,17 +17,26 @@
|
|||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives">
|
||||
<Version>4.3.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Ambrosia\Ambrosia\Ambrosia.csproj" />
|
||||
|
|
|
@ -18,10 +18,25 @@
|
|||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage">
|
||||
<Version>9.3.2</Version>
|
||||
<Version>9.3.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
|
@ -23,14 +23,22 @@
|
|||
<!-- </Target> -->
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.2" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
|
|
|
@ -16,7 +16,27 @@
|
|||
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^netcoreapp\d'))">
|
||||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Clients\CSharp\AmbrosiaLibCS\AmbrosiaLibCS.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
|
@ -18,12 +18,27 @@
|
|||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Clients\CSharp\AmbrosiaLibCS\AmbrosiaLibCS.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<ProjectReference Include="..\GeneratedSourceFiles\PTIAmbrosiaGeneratedAPINetCore\latest\PTIAmbrosiaGeneratedAPINetCore.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
|
||||
|
|
|
@ -16,7 +16,27 @@
|
|||
<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(TargetFramework)', '^netcoreapp\d'))">
|
||||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Clients\CSharp\AmbrosiaLibCS\AmbrosiaLibCS.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
|
@ -59,6 +59,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PTIAmbrosiaGeneratedAPINet4
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PTIAmbrosiaGeneratedAPINetCore", "GeneratedSourceFiles\PTIAmbrosiaGeneratedAPINetCore\latest\PTIAmbrosiaGeneratedAPINetCore.csproj", "{029135E9-7945-4C57-8535-FF17FABB8A7E}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnsafeDeregisterInstance", "..\..\DevTools\UnsafeDeregisterInstance\UnsafeDeregisterInstance.csproj", "{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
@ -137,6 +139,12 @@ Global
|
|||
{029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|x64.Build.0 = Release|Any CPU
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|Any CPU.ActiveCfg = Debug|x64
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|x64.Build.0 = Debug|x64
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|Any CPU.ActiveCfg = Release|x64
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|x64.ActiveCfg = Release|x64
|
||||
{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -18,12 +18,27 @@
|
|||
<DefineConstants>NETCORE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CRA" Version="2018.11.5.1" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="2.7.0" />
|
||||
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.8.168" />
|
||||
<PackageReference Include="Mono.Options.Core" Version="1.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Remote.Linq" Version="5.8.1" />
|
||||
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
|
||||
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
|
||||
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Clients\CSharp\AmbrosiaLibCS\AmbrosiaLibCS.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="System.CodeDom">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager">
|
||||
<Version>4.5.0</Version>
|
||||
</PackageReference>
|
||||
<ProjectReference Include="..\GeneratedSourceFiles\PTIAmbrosiaGeneratedAPINetCore\latest\PTIAmbrosiaGeneratedAPINetCore.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
|
||||
|
|
Загрузка…
Ссылка в новой задаче