Skip to content

Commit

Permalink
Merge pull request #16 from DuendeSoftware/dom/merge-slns
Browse files Browse the repository at this point in the history 
Update Repo structure to single solution [WIP]
  • Loading branch information
@brockallen
brockallen authored Nov 24, 2020
2 parents cf942f2 + 3ebbd5e commit a6547ea
Show file tree
Hide file tree
Showing 1,389 changed files with 628 additions and 3,114 deletions.
18 changes: 0 additions & 18 deletions .config/dotnet-tools.json
View file

This file was deleted.

9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ jobs:
steps:
- uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819

- name: Setup dotnet
- name: Setup dotnet (main)
uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.100'
- name: Setup dotnet

- name: Setup dotnet (testing)
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
Expand All @@ -39,4 +38,4 @@ jobs:
- if: (matrix.runs-on == 'windows-latest') && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
run: |
./build.ps1
dotnet nuget push .\nuget\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
dotnet nuget push .\artifacts\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
7 changes: 3 additions & 4 deletions src/Directory.Build.props → Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

<ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">True</ContinuousIntegrationBuild>

<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">True</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup>
<None Include="../../../LICENSE" Pack="true" Visible="false" PackagePath="" />
<None Include="../../../icon.png" Pack="true" Visible="false" PackagePath="" />
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="" />
<None Include="../../icon.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
</Project>
19 changes: 5 additions & 14 deletions src/Directory.Build.targets → Directory.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project>

<PropertyGroup>
<IdentityServerVersion>5.0.0-*</IdentityServerVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'netstandard2.0'">
<FrameworkVersion>3.1.0</FrameworkVersion>
<ExtensionsVersion>3.1.0</ExtensionsVersion>
Expand All @@ -19,27 +15,21 @@
</PropertyGroup>

<ItemGroup>
<!--our stuff -->
<PackageReference Update="IdentityModel" Version="4.5.0" />

<!--build related-->
<PackageReference Include="MinVer" Version="2.3.0" PrivateAssets="All" />
<PackageReference Update="SimpleExec" Version="6.2.0" />
<PackageReference Update="Bullseye" Version="3.3.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

<!--tests -->
<PackageReference Update="FluentAssertions" Version="5.10.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />

<!--our stuff -->
<PackageReference Update="IdentityModel" Version="4.4.0" />

<PackageReference Update="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
<PackageReference Update="Duende.IdentityServer.AspNetIdentity" Version="$(IdentityServerVersion)" />
<PackageReference Update="Duende.IdentityServer.Storage" Version="$(IdentityServerVersion)" />
<PackageReference Update="Duende.IdentityServer.EntityFramework.Storage" Version="$(IdentityServerVersion)" />
<PackageReference Update="Duende.IdentityServer.EntityFramework" Version="$(IdentityServerVersion)" />

<!--microsoft extensions -->
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="$(ExtensionsVersion)" />
<PackageReference Update="Microsoft.Extensions.Http" Version="$(ExtensionsVersion)" />
Expand All @@ -53,6 +43,7 @@
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(WilsonVersion)" />
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="$(WilsonVersion)" />
<PackageReference Update="AutoMapper" Version="[10.0.0,11.0)" />
<PackageReference Update="Serilog.AspNetCore" Version="3.4.0" />

<!--microsoft asp.net core -->
<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(FrameworkVersion)" />
Expand Down
103 changes: 103 additions & 0 deletions Duende.IdentityServer.Core.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.IdentityServer.Storage", "src\Storage\Duende.IdentityServer.Storage.csproj", "{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.IdentityServer", "src\IdentityServer\Duende.IdentityServer.csproj", "{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF26567D-46BB-4720-8610-EC3D6AB9793C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.UnitTests", "test\IdentityServer.UnitTests\IdentityServer.UnitTests.csproj", "{7FE80A13-4265-4427-91E1-89C8AA7548BC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.IntegrationTests", "test\IdentityServer.IntegrationTests\IdentityServer.IntegrationTests.csproj", "{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{82C80BEB-73A0-4B96-83A4-7C69792CF010}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "hosts\main\Host.csproj", "{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}"
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
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
{7FE80A13-4265-4427-91E1-89C8AA7548BC} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE} = {82C80BEB-73A0-4B96-83A4-7C69792CF010}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.ActiveCfg = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.Build.0 = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.ActiveCfg = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.Build.0 = Debug|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.Build.0 = Release|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.ActiveCfg = Release|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.Build.0 = Release|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.ActiveCfg = Release|Any CPU
{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.Build.0 = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.ActiveCfg = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.Build.0 = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.ActiveCfg = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.Build.0 = Debug|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.Build.0 = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.ActiveCfg = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.Build.0 = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.ActiveCfg = Release|Any CPU
{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.Build.0 = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.ActiveCfg = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.Build.0 = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.ActiveCfg = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.Build.0 = Debug|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.Build.0 = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.ActiveCfg = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.Build.0 = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.ActiveCfg = Release|Any CPU
{7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.Build.0 = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.Build.0 = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.ActiveCfg = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.Build.0 = Debug|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.Build.0 = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.ActiveCfg = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.Build.0 = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.ActiveCfg = Release|Any CPU
{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.Build.0 = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.ActiveCfg = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.Build.0 = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.Build.0 = Debug|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.Build.0 = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.ActiveCfg = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.Build.0 = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.ActiveCfg = Release|Any CPU
{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Loading

0 comments on commit a6547ea

Please sign in to comment.