Skip to content

Commit f1e2683

Browse files
JerichoJericho
authored
Merge pull request #71 from Jericho/upgrade_xproj
Upgrade XPROJ files
2 parents a9350c1 + e30d425 commit f1e2683

8 files changed

Lines changed: 98 additions & 300 deletions

File tree

‎Http-Multipart-Data-Parser.sln‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29503.13
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C8315ADA-EC28-4A5B-92B9-6490BD9D6A6F}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpMultipartParser", "HttpMultipartParser\HttpMultipartParser.csproj", "{EA2AE348-5520-4FEE-815B-02D90322804D}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{94B6C0BD-6359-4B43-B556-E14F0ED3B1DA}"
9-
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
11-
EndProjectSection
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpMultipartParserUnitTest", "HttpMultipartParserUnitTest\HttpMultipartParserUnitTest.csproj", "{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523}"
129
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpMultipartParser", "HttpMultipartParser\HttpMultipartParser.xproj", "{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1}"
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5DA81F7F-C5C0-43F3-81CE-1513B3FEAA06}"
1411
EndProject
15-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9EAFC333-C9BF-4FE4-A746-C57774C17F60}"
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D51F3380-641A-41EC-9397-D16B2196A24A}"
1613
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HttpMultipartParserUnitTest", "HttpMultipartParserUnitTest\HttpMultipartParserUnitTest.xproj", "{8A88412D-1A14-4F40-A638-89A4735870AA}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5D8E3C6B-9DC8-4D8D-BAA4-6D739906AFE5}"
1815
EndProject
1916
Global
2017
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2118
Debug|Any CPU = Debug|Any CPU
2219
Release|Any CPU = Release|Any CPU
2320
EndGlobalSection
2421
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{8A88412D-1A14-4F40-A638-89A4735870AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{8A88412D-1A14-4F40-A638-89A4735870AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{8A88412D-1A14-4F40-A638-89A4735870AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{8A88412D-1A14-4F40-A638-89A4735870AA}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{EA2AE348-5520-4FEE-815B-02D90322804D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{EA2AE348-5520-4FEE-815B-02D90322804D}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{EA2AE348-5520-4FEE-815B-02D90322804D}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{EA2AE348-5520-4FEE-815B-02D90322804D}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523}.Release|Any CPU.Build.0 = Release|Any CPU
3330
EndGlobalSection
3431
GlobalSection(SolutionProperties) = preSolution
3532
HideSolutionNode = FALSE
3633
EndGlobalSection
3734
GlobalSection(NestedProjects) = preSolution
38-
{E57CD0C7-6812-46E4-B868-6C15B1AC2BD1} = {C8315ADA-EC28-4A5B-92B9-6490BD9D6A6F}
39-
{8A88412D-1A14-4F40-A638-89A4735870AA} = {9EAFC333-C9BF-4FE4-A746-C57774C17F60}
35+
{EA2AE348-5520-4FEE-815B-02D90322804D} = {D51F3380-641A-41EC-9397-D16B2196A24A}
36+
{5E49EE76-62B3-40E3-BEFC-3F0CB8BEE523} = {5D8E3C6B-9DC8-4D8D-BAA4-6D739906AFE5}
37+
EndGlobalSection
38+
GlobalSection(ExtensibilityGlobals) = postSolution
39+
SolutionGuid = {EC47708C-FE9B-4234-8622-7049B6B01005}
4040
EndGlobalSection
4141
EndGlobal

‎HttpMultipartParser/HttpMultipartParser.csproj‎

Lines changed: 45 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,55 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4691988A-CE66-40CB-AFB4-2757255E03E0}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>HttpMultipartParser</RootNamespace>
4+
<AssemblyTitle>HttpMultipartParser</AssemblyTitle>
5+
<VersionPrefix>2.2.4</VersionPrefix>
6+
<TargetFrameworks>netstandard1.3;net45;net451;net452;net46</TargetFrameworks>
7+
<PlatformTarget>anycpu</PlatformTarget>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
119
<AssemblyName>HttpMultipartParser</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE;NET40</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<DocumentationFile>bin\Debug\HttpMultipartParser.XML</DocumentationFile>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE;NET40</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<DocumentationFile>bin\Release\HttpMultipartParser.XML</DocumentationFile>
34-
</PropertyGroup>
35-
<PropertyGroup>
36-
<SignAssembly>true</SignAssembly>
37-
</PropertyGroup>
38-
<PropertyGroup>
10+
<OutputType>Library</OutputType>
3911
<AssemblyOriginatorKeyFile>HttpMultipartParser.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>HttpMultipartParser</PackageId>
15+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
16+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
17+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
18+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
19+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
20+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
21+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
22+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
23+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
24+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
4025
</PropertyGroup>
41-
<ItemGroup>
26+
27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
4228
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
4629
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Xml" />
4930
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="BinaryStreamStack.cs" />
52-
<Compile Include="FilePart.cs" />
53-
<Compile Include="MultipartFormDataParser.cs" />
54-
<Compile Include="MultipartParseException.cs" />
55-
<Compile Include="MultipartStreamPart.cs" />
56-
<Compile Include="ParameterPart.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
<Compile Include="RebufferableBinaryReader.cs" />
59-
<Compile Include="StreamingMultipartFormDataParser.cs" />
60-
<Compile Include="SubsequenceFinder.cs" />
31+
32+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
33+
<Reference Include="System" />
34+
<Reference Include="Microsoft.CSharp" />
6135
</ItemGroup>
62-
<ItemGroup>
63-
<None Include="HttpMultipartParser.nuspec" />
64-
<None Include="HttpMultipartParser.snk" />
36+
37+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
38+
<Reference Include="System" />
39+
<Reference Include="Microsoft.CSharp" />
6540
</ItemGroup>
66-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
67-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
68-
Other similar extension points exist, see Microsoft.Common.targets.
69-
<Target Name="BeforeBuild">
70-
</Target>
71-
<Target Name="AfterBuild">
41+
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
43+
<Reference Include="System" />
44+
<Reference Include="Microsoft.CSharp" />
45+
</ItemGroup>
46+
47+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
48+
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
49+
</PropertyGroup>
50+
51+
<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
52+
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />
7253
</Target>
73-
-->
74-
</Project>
54+
55+
</Project>

‎HttpMultipartParser/HttpMultipartParser.xproj‎

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

‎HttpMultipartParser/project.json‎

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

‎HttpMultipartParserUnitTest/HttpMultipartParserUnitTest.csproj‎

Lines changed: 33 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,41 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{FA7D167E-1ADE-4062-BC3C-B438993DAD8B}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>HttpMultipartParserUnitTest</RootNamespace>
4+
<AssemblyTitle>HttpMultipartParserUnitTest</AssemblyTitle>
5+
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
6+
<PlatformTarget>anycpu</PlatformTarget>
107
<AssemblyName>HttpMultipartParserUnitTest</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
17-
<IsCodedUITest>False</IsCodedUITest>
18-
<TestProjectType>UnitTest</TestProjectType>
19-
<TargetFrameworkProfile />
8+
<PackageId>HttpMultipartParserUnitTest</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
11+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
12+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
13+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
14+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
18+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
2020
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
</PropertyGroup>
38-
<PropertyGroup>
39-
<SignAssembly>true</SignAssembly>
40-
</PropertyGroup>
41-
<PropertyGroup>
42-
<AssemblyOriginatorKeyFile>..\HttpMultipartParser\HttpMultipartParser.snk</AssemblyOriginatorKeyFile>
43-
</PropertyGroup>
44-
<ItemGroup>
45-
<Reference Include="System" />
46-
</ItemGroup>
47-
<Choose>
48-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
49-
<ItemGroup>
50-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
51-
</ItemGroup>
52-
</When>
53-
<Otherwise>
54-
<ItemGroup>
55-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
56-
</ItemGroup>
57-
</Otherwise>
58-
</Choose>
59-
<ItemGroup>
60-
<Compile Include="BinaryStreamStackUnitTest.cs" />
61-
<Compile Include="HttpMultipartFormParserUnitTest.cs" />
62-
<Compile Include="Properties\AssemblyInfo.cs" />
63-
<Compile Include="RebufferableBinaryReaderUnitTest.cs" />
64-
<Compile Include="SubsequenceFinderUnitTest.cs" />
65-
<Compile Include="TestUtil.cs" />
66-
</ItemGroup>
21+
6722
<ItemGroup>
68-
<ProjectReference Include="..\HttpMultipartParser\HttpMultipartParser.csproj">
69-
<Project>{4691988a-ce66-40cb-afb4-2757255e03e0}</Project>
70-
<Name>HttpMultipartParser</Name>
71-
</ProjectReference>
23+
<ProjectReference Include="..\HttpMultipartParser\HttpMultipartParser.csproj" />
7224
</ItemGroup>
25+
7326
<ItemGroup>
74-
<WCFMetadata Include="Service References\" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
29+
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
7530
</ItemGroup>
76-
<ItemGroup>
77-
<None Include="..\HttpMultipartParser\HttpMultipartParser.snk">
78-
<Link>HttpMultipartParser.snk</Link>
79-
</None>
31+
32+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
33+
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
34+
</PropertyGroup>
35+
36+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
37+
<Reference Include="System" />
38+
<Reference Include="Microsoft.CSharp" />
8039
</ItemGroup>
81-
<Choose>
82-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
83-
<ItemGroup>
84-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85-
<Private>False</Private>
86-
</Reference>
87-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<Private>False</Private>
89-
</Reference>
90-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<Private>False</Private>
92-
</Reference>
93-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<Private>False</Private>
95-
</Reference>
96-
</ItemGroup>
97-
</When>
98-
</Choose>
99-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
100-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
101-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
102-
Other similar extension points exist, see Microsoft.Common.targets.
103-
<Target Name="BeforeBuild">
104-
</Target>
105-
<Target Name="AfterBuild">
106-
</Target>
107-
-->
108-
</Project>
40+
41+
</Project>

0 commit comments

Comments
 (0)