зеркало из https://github.com/microsoft/jschema.git
Build Json.Pointer for netstandard2.0
This is the first in a series of commits to change all of JSchema to .netstandard and dotnet core. We start with Json.Pointer. We create a new versions of Everything.sln that contains just those projects we've converted to netstandard. We create a new build.props that takes full advantage of the properties defined in the SDK target files. We don't need AssemblyInfo.cs any more.
This commit is contained in:
Larry Golding
Родитель
963fe2ac5e
Коммит
aa4583fde7
|
|
@ -1,102 +1,34 @@
|
|||
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25115.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema", "Json.Schema\Json.Schema.csproj", "{4DA17661-563A-45EE-9731-EEA9360F6C5D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.UnitTests", "Json.Schema.UnitTests\Json.Schema.UnitTests.csproj", "{55223B39-FA1A-4838-AB9B-A7B60A7C1BCE}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C72F6F90-B31B-4847-8DE6-8869DB1A7E5D}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
build.props = build.props
|
||||
..\BuildAndTest.cmd = ..\BuildAndTest.cmd
|
||||
build\CommonAssemblyInfo.cs = build\CommonAssemblyInfo.cs
|
||||
build\CopyRoslynImplementationAssemblies.targets = build\CopyRoslynImplementationAssemblies.targets
|
||||
build\CreateNuGetPackage.targets = build\CreateNuGetPackage.targets
|
||||
build\CurrentVersion.xml = build\CurrentVersion.xml
|
||||
build\Get-VersionConstants.ps1 = build\Get-VersionConstants.ps1
|
||||
build\New-NuGetPackage.ps1 = build\New-NuGetPackage.ps1
|
||||
build\New-VersionConstantsFile.ps1 = build\New-VersionConstantsFile.ps1
|
||||
build\Publish-NuGetPackages.ps1 = build\Publish-NuGetPackages.ps1
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonSchemaToDotNet", "JsonSchemaToDotNet\JsonSchemaToDotNet.csproj", "{BC2D0831-21D6-4586-B045-CADF22430850}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.ToDotNet", "Json.Schema.ToDotNet\Json.Schema.ToDotNet.csproj", "{D9489164-0B7D-4F90-9E3E-339238A86542}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.ToDotNet.UnitTests", "Json.Schema.ToDotNet.UnitTests\Json.Schema.ToDotNet.UnitTests.csproj", "{1B28A331-1C49-41EC-976A-8D3B8F232ED1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.ValidationSuiteTests", "Json.Schema.ValidationSuiteTests\Json.Schema.ValidationSuiteTests.csproj", "{A3364755-B20A-494E-9C33-379855D460C9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonSchemaValidator", "JsonSchemaValidator\JsonSchemaValidator.csproj", "{99D12428-9972-4203-9771-4AC5BD99C904}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.PerformanceTests", "Json.Schema.PerformanceTests\Json.Schema.PerformanceTests.csproj", "{5A97235E-053E-47E9-BBA4-B29C30E208FC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.TestUtilities", "Json.Schema.TestUtilities\Json.Schema.TestUtilities.csproj", "{6D6133A4-8098-4210-99BE-5CA01EB833B1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Pointer", "Json.Pointer\Json.Pointer.csproj", "{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Pointer.UnitTests", "Json.Pointer.UnitTests\Json.Pointer.UnitTests.csproj", "{BEF9C2E2-FC05-4D1D-944E-5A7E8F94F250}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Schema.Validation", "Json.Schema.Validation\Json.Schema.Validation.csproj", "{131DEAE1-55A4-4FC0-BE2E-FF4B9F185CEE}"
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26124.0
|
||||
MinimumVisualStudioVersion = 15.0.26124.0
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Json.Pointer", "Json.Pointer\Json.Pointer.csproj", "{370BB86D-4EC4-4BA9-BED3-3922B078C692}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{4DA17661-563A-45EE-9731-EEA9360F6C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4DA17661-563A-45EE-9731-EEA9360F6C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4DA17661-563A-45EE-9731-EEA9360F6C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4DA17661-563A-45EE-9731-EEA9360F6C5D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{55223B39-FA1A-4838-AB9B-A7B60A7C1BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{55223B39-FA1A-4838-AB9B-A7B60A7C1BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{55223B39-FA1A-4838-AB9B-A7B60A7C1BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{55223B39-FA1A-4838-AB9B-A7B60A7C1BCE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BC2D0831-21D6-4586-B045-CADF22430850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BC2D0831-21D6-4586-B045-CADF22430850}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BC2D0831-21D6-4586-B045-CADF22430850}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BC2D0831-21D6-4586-B045-CADF22430850}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D9489164-0B7D-4F90-9E3E-339238A86542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D9489164-0B7D-4F90-9E3E-339238A86542}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D9489164-0B7D-4F90-9E3E-339238A86542}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D9489164-0B7D-4F90-9E3E-339238A86542}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1B28A331-1C49-41EC-976A-8D3B8F232ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1B28A331-1C49-41EC-976A-8D3B8F232ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1B28A331-1C49-41EC-976A-8D3B8F232ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1B28A331-1C49-41EC-976A-8D3B8F232ED1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A3364755-B20A-494E-9C33-379855D460C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A3364755-B20A-494E-9C33-379855D460C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A3364755-B20A-494E-9C33-379855D460C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A3364755-B20A-494E-9C33-379855D460C9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{99D12428-9972-4203-9771-4AC5BD99C904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{99D12428-9972-4203-9771-4AC5BD99C904}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{99D12428-9972-4203-9771-4AC5BD99C904}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{99D12428-9972-4203-9771-4AC5BD99C904}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5A97235E-053E-47E9-BBA4-B29C30E208FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5A97235E-053E-47E9-BBA4-B29C30E208FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5A97235E-053E-47E9-BBA4-B29C30E208FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5A97235E-053E-47E9-BBA4-B29C30E208FC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6D6133A4-8098-4210-99BE-5CA01EB833B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6D6133A4-8098-4210-99BE-5CA01EB833B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6D6133A4-8098-4210-99BE-5CA01EB833B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6D6133A4-8098-4210-99BE-5CA01EB833B1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BEF9C2E2-FC05-4D1D-944E-5A7E8F94F250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BEF9C2E2-FC05-4D1D-944E-5A7E8F94F250}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BEF9C2E2-FC05-4D1D-944E-5A7E8F94F250}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BEF9C2E2-FC05-4D1D-944E-5A7E8F94F250}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{131DEAE1-55A4-4FC0-BE2E-FF4B9F185CEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{131DEAE1-55A4-4FC0-BE2E-FF4B9F185CEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{131DEAE1-55A4-4FC0-BE2E-FF4B9F185CEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{131DEAE1-55A4-4FC0-BE2E-FF4B9F185CEE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|x64.Build.0 = Debug|x64
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Debug|x86.Build.0 = Debug|x86
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|x64.ActiveCfg = Release|x64
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|x64.Build.0 = Release|x64
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|x86.ActiveCfg = Release|x86
|
||||
{370BB86D-4EC4-4BA9-BED3-3922B078C692}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -1,51 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{B365C6DC-E3FD-4F9E-B069-C3BD99D2098D}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>Microsoft.Json.Pointer</RootNamespace>
|
||||
<AssemblyName>Microsoft.Json.Pointer</AssemblyName>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="AssemblyAttributes">
|
||||
<AssemblyTitle>JSON Pointer Library</AssemblyTitle>
|
||||
<Description>Classes for working with JSON Pointer</Description>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build.props" />
|
||||
|
||||
<ItemGroup>
|
||||
<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>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
|
||||
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="JsonPointer.cs" />
|
||||
<Compile Include="JsonPointerRepresentation.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StringExtensions.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Json.Pointer.nuspec" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.props))\build\CreateNuGetPackage.targets" />
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation. All Rights Reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: AssemblyTitle("JSON Pointer Library")]
|
||||
[assembly: AssemblyDescription("Classes for working with JSON Pointer")]
|
||||
|
|
@ -1,45 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkProfile />
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<OutputSubDir>$(Platform)_$(Configuration)</OutputSubDir>
|
||||
<IntermediateOutputPath>$(MsBuildThisFileDirectory)..\bld\obj\$(MSBuildProjectName)\$(OutputSubDir)\</IntermediateOutputPath>
|
||||
<OutputPath>$(MsBuildThisFileDirectory)..\bld\bin\$(MSBuildProjectName)\$(OutputSubDir)\</OutputPath>
|
||||
<NuGetPackageName Condition="'$(NuGetPackageName)' == ''">$(MSBuildProjectName)</NuGetPackageName>
|
||||
<PropertyGroup Label="AssemblyAttributes">
|
||||
<Company Condition=" '$(Company)' == '' ">Microsoft Corporation</Company>
|
||||
<Product Condition=" '$(Product)' == '' ">JSON Schema</Product>
|
||||
<Copyright Condition=" '$(Copyright)' == '' ">Copyright (c) Microsoft. All Rights Reserved.</Copyright>
|
||||
<VersionPrefix>0.53.0</VersionPrefix>
|
||||
<VersionSuffix></VersionSuffix>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>$(MsBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="$(MsBuildThisFileDirectory)build\CommonAssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target BeforeTargets="PrepareForBuild" Name="CreateVersionConstantsFile">
|
||||
<Exec Command="powershell -ExecutionPolicy RemoteSigned $(MsBuildThisFileDirectory)build\New-VersionConstantsFile.ps1 $(IntermediateOutputPath) $(AssemblyName)" />
|
||||
<ItemGroup>
|
||||
<Compile Include="$(IntermediateOutputPath)VersionConstants.cs" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
<PropertyGroup Label="Package">
|
||||
<PackageId Condition=" '$(PackageId)' == '' ">$(MSBuildProjectName)</PackageId>
|
||||
<Authors Condition=" '$(Authors)' == '' ">$(Company)</Authors>
|
||||
<PackageRequireLicenseAcceptance Condition=" '$(PackageRequireLicenseAcceptance)' == '' ">false</PackageRequireLicenseAcceptance>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче