Skip to content

Commit af2f573

Browse files
ryanbrandenburgryanbrandenburg
committed
Merge remote-tracking branch 'CORS/rybrande/release21ToSrc' into rybrande/Mondo2.1
2 parents 3e59973 + 2374a67 commit af2f573

File tree

67 files changed

+6158
-0
lines changed

Some content is hidden

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

67 files changed

+6158
-0
lines changed

‎src/CORS/.gitignore

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
*.sln.ide/
6+
_ReSharper.*/
7+
packages/
8+
artifacts/
9+
PublishProfiles/
10+
.vs/
11+
bower_components/
12+
node_modules/
13+
**/wwwroot/lib/
14+
debugSettings.json
15+
project.lock.json
16+
*.user
17+
*.suo
18+
*.cache
19+
*.docstates
20+
_ReSharper.*
21+
nuget.exe
22+
*net45.csproj
23+
*net451.csproj
24+
*k10.csproj
25+
*.psess
26+
*.vsp
27+
*.pidb
28+
*.userprefs
29+
*DS_Store
30+
*.ncrunchsolution
31+
*.*sdf
32+
*.ipch
33+
.settings
34+
*.sln.ide
35+
node_modules
36+
**/[Cc]ompiler/[Rr]esources/**/*.js
37+
*launchSettings.json
38+
.build/
39+
.testPublish/
40+
.vscode
41+
global.json

‎src/CORS/CORS.sln

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.26817.0
4+
MinimumVisualStudioVersion = 15.0.26730.03
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{84FE6872-A610-4CEC-855F-A84CBF1F40FC}"
6+
ProjectSection(SolutionItems) = preProject
7+
src\Directory.Build.props = src\Directory.Build.props
8+
EndProjectSection
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F32074C7-087C-46CC-A913-422BFD2D6E0A}"
11+
ProjectSection(SolutionItems) = preProject
12+
test\Directory.Build.props = test\Directory.Build.props
13+
EndProjectSection
14+
EndProject
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.csproj", "{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}"
16+
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors.Test", "test\Microsoft.AspNetCore.Cors.Test\Microsoft.AspNetCore.Cors.Test.csproj", "{F05BE96F-F869-4408-A480-96935B4835EE}"
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{538380BF-0D4C-4E30-8F41-E75C4B1C01FA}"
20+
EndProject
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "test\WebSites\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}"
22+
EndProject
23+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{960E0703-A8A5-44DF-AA87-B7C614683B3C}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleDestination", "samples\SampleDestination\SampleDestination.csproj", "{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}"
26+
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleOrigin", "samples\SampleOrigin\SampleOrigin.csproj", "{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}"
28+
EndProject
29+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0CCC5C1B-F548-4A17-96F8-14C700093FA0}"
30+
ProjectSection(SolutionItems) = preProject
31+
.appveyor.yml = .appveyor.yml
32+
.gitattributes = .gitattributes
33+
.gitignore = .gitignore
34+
.travis.yml = .travis.yml
35+
build.cmd = build.cmd
36+
build.ps1 = build.ps1
37+
build.sh = build.sh
38+
CONTRIBUTING.md = CONTRIBUTING.md
39+
Directory.Build.props = Directory.Build.props
40+
Directory.Build.targets = Directory.Build.targets
41+
LICENSE.txt = LICENSE.txt
42+
NuGet.config = NuGet.config
43+
NuGetPackageVerifier.json = NuGetPackageVerifier.json
44+
README.md = README.md
45+
version.xml = version.xml
46+
EndProjectSection
47+
EndProject
48+
Global
49+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
50+
Debug|Any CPU = Debug|Any CPU
51+
Release|Any CPU = Release|Any CPU
52+
EndGlobalSection
53+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
54+
{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{F05BE96F-F869-4408-A480-96935B4835EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{F05BE96F-F869-4408-A480-96935B4835EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{F05BE96F-F869-4408-A480-96935B4835EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{F05BE96F-F869-4408-A480-96935B4835EE}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{F6675DC1-AA21-453B-89B6-DA425FB9C3A5}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{99460370-AE5D-4DC9-8DBF-04DF66D6B21D}.Release|Any CPU.Build.0 = Release|Any CPU
74+
EndGlobalSection
75+
GlobalSection(SolutionProperties) = preSolution
76+
HideSolutionNode = FALSE
77+
EndGlobalSection
78+
GlobalSection(NestedProjects) = preSolution
79+
{41349FCD-D1C4-47A6-82D0-D16D00A8D59D} = {84FE6872-A610-4CEC-855F-A84CBF1F40FC}
80+
{F05BE96F-F869-4408-A480-96935B4835EE} = {F32074C7-087C-46CC-A913-422BFD2D6E0A}
81+
{538380BF-0D4C-4E30-8F41-E75C4B1C01FA} = {F32074C7-087C-46CC-A913-422BFD2D6E0A}
82+
{B42D4844-FFF8-4EC2-88D1-3AE95234D9EB} = {538380BF-0D4C-4E30-8F41-E75C4B1C01FA}
83+
{F6675DC1-AA21-453B-89B6-DA425FB9C3A5} = {960E0703-A8A5-44DF-AA87-B7C614683B3C}
84+
{99460370-AE5D-4DC9-8DBF-04DF66D6B21D} = {960E0703-A8A5-44DF-AA87-B7C614683B3C}
85+
EndGlobalSection
86+
GlobalSection(ExtensibilityGlobals) = postSolution
87+
SolutionGuid = {F9ED9C53-44CD-4853-9621-D028B7B6A431}
88+
EndGlobalSection
89+
EndGlobal

‎src/CORS/Directory.Build.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<Import
3+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
4+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
5+
6+
<Import Project="version.props" />
7+
<Import Project="build\dependencies.props" />
8+
<Import Project="build\sources.props" />
9+
10+
<PropertyGroup>
11+
<Product>Microsoft ASP.NET Core</Product>
12+
<RepositoryUrl>https://github.com/aspnet/CORS</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
15+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
16+
<SignAssembly>true</SignAssembly>
17+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
18+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19+
</PropertyGroup>
20+
21+
</Project>

‎src/CORS/Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5+
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
6+
</PropertyGroup>
7+
</Project>

‎src/CORS/NuGetPackageVerifier.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"Default": {
3+
"rules": [
4+
"DefaultCompositeRule"
5+
]
6+
}
7+
}

‎src/CORS/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
CORS
2+
===
3+
AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/yi0m8evjtg107o12/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/CORS/branch/dev)
4+
5+
Travis: [![Travis](https://travis-ci.org/aspnet/CORS.svg?branch=dev)](https://travis-ci.org/aspnet/CORS)
6+
7+
CORS repository includes the core implementation for CORS policy, utilized by the CORS middleware and MVC.
8+
9+
This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.

‎src/CORS/build/Key.snk

596 Bytes
Binary file not shown.

‎src/CORS/build/buildpipeline/linux.groovy

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@Library('dotnet-ci') _
2+
3+
simpleNode('Ubuntu16.04', 'latest-or-auto-docker') {
4+
stage ('Checking out source') {
5+
checkout scm
6+
}
7+
stage ('Build') {
8+
sh './build.sh --ci'
9+
}
10+
}

‎src/CORS/build/buildpipeline/osx.groovy

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@Library('dotnet-ci') _
2+
3+
simpleNode('OSX10.12','latest') {
4+
stage ('Checking out source') {
5+
checkout scm
6+
}
7+
stage ('Build') {
8+
sh './build.sh --ci'
9+
}
10+
}

‎src/CORS/build/buildpipeline/pipeline.groovy

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import org.dotnet.ci.pipelines.Pipeline
2+
3+
def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy')
4+
def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy')
5+
def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy')
6+
String configuration = 'Release'
7+
def parameters = [
8+
'Configuration': configuration
9+
]
10+
11+
windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters)
12+
windowsPipeline.triggerPipelineOnGithubPush(parameters)
13+
14+
linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters)
15+
linuxPipeline.triggerPipelineOnGithubPush(parameters)
16+
17+
osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters)
18+
osxPipeline.triggerPipelineOnGithubPush(parameters)

0 commit comments

Comments
 (0)