Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 96f33b2

Browse files
committed
Migrate from xproj to csproj
1 parent 2703835 commit 96f33b2

File tree

64 files changed

+340
-870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+340
-870
lines changed

HttpAbstractions.sln

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,60 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 14
3-
VisualStudioVersion = 14.0.24711.0
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26120.4
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5A15F1C-885A-452A-A731-B0173DDBD913}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F31FF137-390C-49BF-A3BD-7C6ED3597C21}"
88
EndProject
9-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http", "src\Microsoft.AspNetCore.Http\Microsoft.AspNetCore.Http.xproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}"
9+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{982F09D8-621E-4872-BA7B-BBDEA47D1EFD}"
1010
EndProject
11-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Abstractions", "src\Microsoft.AspNetCore.Http.Abstractions\Microsoft.AspNetCore.Http.Abstractions.xproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}"
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "src\Microsoft.AspNetCore.Http\Microsoft.AspNetCore.Http.csproj", "{BCF0F967-8753-4438-BD07-AADCA9CE509A}"
1212
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Features", "src\Microsoft.AspNetCore.Http.Features\Microsoft.AspNetCore.Http.Features.xproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
13+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "src\Microsoft.AspNetCore.Http.Abstractions\Microsoft.AspNetCore.Http.Abstractions.csproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}"
1414
EndProject
15-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Tests", "test\Microsoft.AspNetCore.Http.Tests\Microsoft.AspNetCore.Http.Tests.xproj", "{AA99AF26-F7B1-4A6B-A922-5C25539F6391}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "src\Microsoft.AspNetCore.Http.Features\Microsoft.AspNetCore.Http.Features.csproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
1616
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Features.Tests", "test\Microsoft.AspNetCore.Http.Features.Tests\Microsoft.AspNetCore.Http.Features.Tests.xproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Tests", "test\Microsoft.AspNetCore.Http.Tests\Microsoft.AspNetCore.Http.Tests.csproj", "{AA99AF26-F7B1-4A6B-A922-5C25539F6391}"
1818
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Abstractions.Tests", "test\Microsoft.AspNetCore.Http.Abstractions.Tests\Microsoft.AspNetCore.Http.Abstractions.Tests.xproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features.Tests", "test\Microsoft.AspNetCore.Http.Features.Tests\Microsoft.AspNetCore.Http.Features.Tests.csproj", "{C5D2BAE1-E182-48A0-AA74-1AF14B782BF7}"
2020
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Owin", "src\Microsoft.AspNetCore.Owin\Microsoft.AspNetCore.Owin.xproj", "{59BED991-F207-48ED-B24C-0A1D9C986C01}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions.Tests", "test\Microsoft.AspNetCore.Http.Abstractions.Tests\Microsoft.AspNetCore.Http.Abstractions.Tests.csproj", "{F16692B8-9F38-4DCA-A582-E43172B989C6}"
2222
EndProject
23-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Owin.Tests", "test\Microsoft.AspNetCore.Owin.Tests\Microsoft.AspNetCore.Owin.Tests.xproj", "{16219571-3268-4D12-8689-12B7163DBA13}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin", "src\Microsoft.AspNetCore.Owin\Microsoft.AspNetCore.Owin.csproj", "{59BED991-F207-48ED-B24C-0A1D9C986C01}"
2424
EndProject
25-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Extensions", "src\Microsoft.AspNetCore.Http.Extensions\Microsoft.AspNetCore.Http.Extensions.xproj", "{CCC4363E-81E2-4058-94DD-00494E9E992A}"
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Owin.Tests", "test\Microsoft.AspNetCore.Owin.Tests\Microsoft.AspNetCore.Owin.Tests.csproj", "{16219571-3268-4D12-8689-12B7163DBA13}"
2626
EndProject
27-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "test\Microsoft.AspNetCore.Http.Extensions.Tests\Microsoft.AspNetCore.Http.Extensions.Tests.xproj", "{AE25EF21-7F91-4B86-B73E-AF746821D339}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "src\Microsoft.AspNetCore.Http.Extensions\Microsoft.AspNetCore.Http.Extensions.csproj", "{CCC4363E-81E2-4058-94DD-00494E9E992A}"
2828
EndProject
29-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebUtilities", "src\Microsoft.AspNetCore.WebUtilities\Microsoft.AspNetCore.WebUtilities.xproj", "{A2FB7838-0031-4FAD-BA3E-83C30B3AF406}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions.Tests", "test\Microsoft.AspNetCore.Http.Extensions.Tests\Microsoft.AspNetCore.Http.Extensions.Tests.csproj", "{AE25EF21-7F91-4B86-B73E-AF746821D339}"
3030
EndProject
31-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.WebUtilities.Tests", "test\Microsoft.AspNetCore.WebUtilities.Tests\Microsoft.AspNetCore.WebUtilities.Tests.xproj", "{93C10E50-BCBB-4D8E-9492-D46E1396225B}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "src\Microsoft.AspNetCore.WebUtilities\Microsoft.AspNetCore.WebUtilities.csproj", "{A2FB7838-0031-4FAD-BA3E-83C30B3AF406}"
3232
EndProject
33-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Headers", "src\Microsoft.Net.Http.Headers\Microsoft.Net.Http.Headers.xproj", "{60AA2FDB-8121-4826-8D00-9A143FEFAF66}"
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Tests", "test\Microsoft.AspNetCore.WebUtilities.Tests\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "{93C10E50-BCBB-4D8E-9492-D46E1396225B}"
3434
EndProject
35-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Headers.Tests", "test\Microsoft.Net.Http.Headers.Tests\Microsoft.Net.Http.Headers.Tests.xproj", "{E6BB7AD1-BD10-4A23-B780-F4A86ADF00D1}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "src\Microsoft.Net.Http.Headers\Microsoft.Net.Http.Headers.csproj", "{60AA2FDB-8121-4826-8D00-9A143FEFAF66}"
3636
EndProject
37-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{982F09D8-621E-4872-BA7B-BBDEA47D1EFD}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers.Tests", "test\Microsoft.Net.Http.Headers.Tests\Microsoft.Net.Http.Headers.Tests.csproj", "{E6BB7AD1-BD10-4A23-B780-F4A86ADF00D1}"
38+
EndProject
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{1D0764B4-1DEB-4232-A714-D4B7E846918A}"
40+
EndProject
41+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C6C48D5F-B289-4150-A6FC-77A5C7064BCE}"
42+
ProjectSection(SolutionItems) = preProject
43+
.travis.yml = .travis.yml
44+
appveyor.yml = appveyor.yml
45+
build.cmd = build.cmd
46+
build.ps1 = build.ps1
47+
build.sh = build.sh
48+
NuGet.config = NuGet.config
49+
README.md = README.md
50+
version.props = version.props
51+
EndProjectSection
3852
EndProject
39-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\SampleApp\SampleApp.xproj", "{1D0764B4-1DEB-4232-A714-D4B7E846918A}"
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{ED7BCAC5-2796-44BD-9954-7C248263BC8B}"
54+
ProjectSection(SolutionItems) = preProject
55+
build\common.props = build\common.props
56+
build\Key.snk = build\Key.snk
57+
EndProjectSection
4058
EndProject
4159
Global
4260
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -224,5 +242,6 @@ Global
224242
{60AA2FDB-8121-4826-8D00-9A143FEFAF66} = {A5A15F1C-885A-452A-A731-B0173DDBD913}
225243
{E6BB7AD1-BD10-4A23-B780-F4A86ADF00D1} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21}
226244
{1D0764B4-1DEB-4232-A714-D4B7E846918A} = {982F09D8-621E-4872-BA7B-BBDEA47D1EFD}
245+
{ED7BCAC5-2796-44BD-9954-7C248263BC8B} = {C6C48D5F-B289-4150-A6FC-77A5C7064BCE}
227246
EndGlobalSection
228247
EndGlobal

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<configuration>
33
<packageSources>
44
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
5+
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
56
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
67
</packageSources>
78
</configuration>

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ build_script:
1010
- build.cmd --quiet verify
1111
clone_depth: 1
1212
test: off
13-
deploy: off
13+
deploy: off
14+
os: Visual Studio 2017 RC

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi
File renamed without changes.

build/common.props

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<Import Project="..\version.props" />
3+
4+
<PropertyGroup>
5+
<Product>Microsoft ASP.NET Core</Product>
6+
<RepositoryUrl>https://github.com/aspnet/HttpAbstractions</RepositoryUrl>
7+
<RepositoryType>git</RepositoryType>
8+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
9+
<SignAssembly>true</SignAssembly>
10+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
11+
<NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
12+
<NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
13+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
18+
</ItemGroup>
19+
20+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
21+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
22+
</ItemGroup>
23+
24+
</Project>

global.json

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

samples/SampleApp/SampleApp.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
4+
<!-- TODO remove when https://github.com/dotnet/sdk/issues/396 is resolved -->
5+
<RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp1.1' ">win7-x64</RuntimeIdentifier>
6+
<OutputType>Exe</OutputType>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Http\Microsoft.AspNetCore.Http.csproj" />
10+
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Http.Extensions\Microsoft.AspNetCore.Http.Extensions.csproj" />
11+
</ItemGroup>
12+
</Project>

samples/SampleApp/SampleApp.xproj

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

samples/SampleApp/project.json

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\common.props" />
3+
<PropertyGroup>
4+
<Description>ASP.NET Core HTTP object model for HTTP requests and responses and also common extension methods for registering middleware in an IApplicationBuilder.
5+
Commonly used types:
6+
Microsoft.AspNetCore.Builder.IApplicationBuilder
7+
Microsoft.AspNetCore.Http.HttpContext
8+
Microsoft.AspNetCore.Http.HttpRequest
9+
Microsoft.AspNetCore.Http.HttpResponse</Description>
10+
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<PackageTags>aspnetcore</PackageTags>
13+
<NoWarn>$(NoWarn);CS1591</NoWarn>
14+
</PropertyGroup>
15+
<ItemGroup>
16+
<ProjectReference Include="..\Microsoft.AspNetCore.Http.Features\Microsoft.AspNetCore.Http.Features.csproj" />
17+
<PackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="1.2.0-*" PrivateAssets="All" />
18+
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="1.2.0-*" PrivateAssets="All" />
19+
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-*" />
20+
</ItemGroup>
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
22+
<PackageReference Include="System.Globalization.Extensions" Version="4.4.0-*" />
23+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0-*" />
24+
</ItemGroup>
25+
</Project>

src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.xproj

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
using System.Reflection;
5-
using System.Resources;
64
using System.Runtime.CompilerServices;
75

8-
[assembly: AssemblyMetadata("Serviceable", "True")]
9-
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Http.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
10-
[assembly: NeutralResourcesLanguage("en-us")]
11-
[assembly: AssemblyCompany("Microsoft Corporation.")]
12-
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
13-
[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
6+
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Http.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

src/Microsoft.AspNetCore.Http.Abstractions/project.json

Lines changed: 0 additions & 52 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\build\common.props" />
3+
<PropertyGroup>
4+
<Description>ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state.</Description>
5+
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
6+
<NoWarn>$(NoWarn);CS1591</NoWarn>
7+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
8+
<PackageTags>aspnetcore</PackageTags>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<ProjectReference Include="..\Microsoft.AspNetCore.Http.Abstractions\Microsoft.AspNetCore.Http.Abstractions.csproj" />
12+
<ProjectReference Include="..\Microsoft.Net.Http.Headers\Microsoft.Net.Http.Headers.csproj" />
13+
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.2.0-*" />
14+
<PackageReference Include="System.Buffers" Version="4.4.0-*" />
15+
</ItemGroup>
16+
</Project>

0 commit comments

Comments
 (0)