Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
update to RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
leastprivilege committed May 19, 2016
1 parent f28e6db commit 3c2353f
Show file tree
Hide file tree
Showing 182 changed files with 865 additions and 904 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Expand Up @@ -24,6 +24,7 @@ bld/

# Visual Studo 2015 cache/options directory
.vs/
project.lock.json

# MSTest test Results
[Tt]est[Rr]esult*/
Expand Down Expand Up @@ -193,7 +194,3 @@ FakesAssemblies/

# Visual Studio 6 workspace options file
*.opt

# ASP.NET 5
project.lock.json
nuget.exe
55 changes: 0 additions & 55 deletions IdentityServer4.Core.sln

This file was deleted.

55 changes: 55 additions & 0 deletions IdentityServer4.sln
@@ -0,0 +1,55 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5461C61B-B06E-46BA-B206-925B660BE727}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A1559F7F-B0FC-49B8-8E19-6B6AED56E082}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IdentityServer4", "src\IdentityServer4\IdentityServer4.xproj", "{407C030E-60E6-41F7-AF43-0AC48EDCC17D}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Host", "src\Host\Host.xproj", "{784B3C88-30FA-415D-B99E-584063064508}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{45C22EDD-91B1-4AEF-8620-77F4E3E7C544}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IdentityServer.UnitTests", "test\IdentityServer.UnitTests\IdentityServer.UnitTests.xproj", "{D95E6C3E-1906-4323-93D0-490A6A2042CD}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "IdentityServer.IntegrationTests", "test\IdentityServer.IntegrationTests\IdentityServer.IntegrationTests.xproj", "{8601FDBB-D19A-4757-8E07-9DA7E43EAC73}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Release|Any CPU.Build.0 = Release|Any CPU
{784B3C88-30FA-415D-B99E-584063064508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{784B3C88-30FA-415D-B99E-584063064508}.Debug|Any CPU.Build.0 = Debug|Any CPU
{784B3C88-30FA-415D-B99E-584063064508}.Release|Any CPU.ActiveCfg = Release|Any CPU
{784B3C88-30FA-415D-B99E-584063064508}.Release|Any CPU.Build.0 = Release|Any CPU
{D95E6C3E-1906-4323-93D0-490A6A2042CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D95E6C3E-1906-4323-93D0-490A6A2042CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D95E6C3E-1906-4323-93D0-490A6A2042CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D95E6C3E-1906-4323-93D0-490A6A2042CD}.Release|Any CPU.Build.0 = Release|Any CPU
{8601FDBB-D19A-4757-8E07-9DA7E43EAC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8601FDBB-D19A-4757-8E07-9DA7E43EAC73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8601FDBB-D19A-4757-8E07-9DA7E43EAC73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8601FDBB-D19A-4757-8E07-9DA7E43EAC73}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{407C030E-60E6-41F7-AF43-0AC48EDCC17D} = {5461C61B-B06E-46BA-B206-925B660BE727}
{784B3C88-30FA-415D-B99E-584063064508} = {5461C61B-B06E-46BA-B206-925B660BE727}
{D95E6C3E-1906-4323-93D0-490A6A2042CD} = {45C22EDD-91B1-4AEF-8620-77F4E3E7C544}
{8601FDBB-D19A-4757-8E07-9DA7E43EAC73} = {45C22EDD-91B1-4AEF-8620-77F4E3E7C544}
EndGlobalSection
EndGlobal
32 changes: 16 additions & 16 deletions build.cmd
@@ -1,17 +1,17 @@
@echo off
cd %~dp0

IF EXIST .nuget\nuget.exe goto restore

echo Downloading nuget.exe
md .nuget
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/latest/nuget.exe' -OutFile '.nuget\nuget.exe'"

:restore
IF EXIST packages goto run
.nuget\NuGet.exe install psake -ExcludeVersion -o packages -nocache
.nuget\NuGet.exe install newtonsoft.json -Version 7.0.1 -ExcludeVersion -o packages -nocache

:run
:: Get Psake to Return Non-Zero Return Code on Build Failure (https://github.com/psake/psake/issues/58)
@echo off
cd %~dp0

IF EXIST .nuget\nuget.exe goto restore

echo Downloading nuget.exe
md .nuget
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/latest/nuget.exe' -OutFile '.nuget\nuget.exe'"

:restore
IF EXIST packages goto run
.nuget\NuGet.exe install psake -ExcludeVersion -o packages -nocache
.nuget\NuGet.exe install newtonsoft.json -Version 7.0.1 -ExcludeVersion -o packages -nocache

:run
:: Get Psake to Return Non-Zero Return Code on Build Failure (https://github.com/psake/psake/issues/58)
@powershell -NoProfile -ExecutionPolicy unrestricted -command "&{ Import-Module .\packages\psake\tools\psake.psm1; Invoke-Psake .\scripts\default.ps1 -parameters @{'configuration'='Release'}; exit !($psake.build_success) }"
2 changes: 1 addition & 1 deletion global.json
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-rc1-final"
"version": "1.0.0-preview1-002702"
}
}
32 changes: 16 additions & 16 deletions scripts/core/utils.ps1
@@ -1,17 +1,17 @@
## http://stackoverflow.com/questions/1499466/powershell-equivalent-of-linq-any
function Test-Any {
[CmdletBinding()]
param($EvaluateCondition,
[Parameter(ValueFromPipeline = $true)] $ObjectToTest)
begin {
$any = $false
}
process {
if (-not $any -and (& $EvaluateCondition $ObjectToTest)) {
$any = $true
}
}
end {
$any
}
## http://stackoverflow.com/questions/1499466/powershell-equivalent-of-linq-any
function Test-Any {
[CmdletBinding()]
param($EvaluateCondition,
[Parameter(ValueFromPipeline = $true)] $ObjectToTest)
begin {
$any = $false
}
process {
if (-not $any -and (& $EvaluateCondition $ObjectToTest)) {
$any = $true
}
}
end {
$any
}
}

0 comments on commit 3c2353f

Please sign in to comment.