Merge pull request #34 from alexhiggins732/release/8.0.4

Identity Server 8 - Release/8.0.4
alexhiggins732 · Feb 17, 2024 · b0d1155 · b0d1155
2 parents aa2512f + 728a682
commit b0d1155
Show file tree

Hide file tree

Showing 1,663 changed files with 54,458 additions and 233,580 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -28,7 +28,6 @@ on:
     - "global.json"
     - "IdentityServer8.DotNet.ruleset"
     - "LICENSCE"
-    - "version.json"
     - "Nuget.config"
     - "SECURITY.md"
     - "SPONSORS.md"
@@ -57,16 +56,22 @@ jobs:
     - uses: dotnet/nbgv@master
       id: nbgv
 
-    - name: Diplay Package Version
-      run: echo "PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}-alpha.${{ steps.nbgv.outputs.VersionRevision }}"
+    - name: Display Package Version
+      run: echo "PackageVersion=${{ steps.nbgv.outputs.SemVer2 }}"
 
     - name: Restore dependencies
       run: dotnet restore src/IdentityServer8.sln
     - name: Build
-      run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SimpleVersion }}-alpha.${{ steps.nbgv.outputs.VersionRevision }}
+      run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SemVer2 }}
     - name: Test
-      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal
+      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal /p:CollectCoverage=true --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura
 
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      env:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: alexhiggins732/IdentityServer8
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Push
       if: ${{ (github.event_name == 'push') && (runner.os == 'Windows') }} 

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -28,7 +28,6 @@ on:
     - "global.json"
     - "IdentityServer8.DotNet.ruleset"
     - "LICENSCE"
-    - "version.json"
     - "Nuget.config"
     - "SECURITY.md"
     - "SPONSORS.md"
@@ -56,16 +55,22 @@ jobs:
 
     - uses: dotnet/nbgv@master
       id: nbgv
-    - name: Diplay Package Version
+    - name: Display Package Version
       run: echo "PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}"
 
     - name: Restore dependencies
       run: dotnet restore src/IdentityServer8.sln
     - name: Build
       run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SimpleVersion }}
     - name: Test
-      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal
+      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal /p:CollectCoverage=true --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura
 
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      env:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: alexhiggins732/IdentityServer8
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Push
       if: ${{ (github.event_name == 'push') && (runner.os == 'Windows') }} 

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -30,7 +30,6 @@ on:
     - "global.json"
     - "IdentityServer8.DotNet.ruleset"
     - "LICENSCE"
-    - "version.json"
     - "Nuget.config"
     - "SECURITY.md"
     - "SPONSORS.md"
@@ -59,7 +58,7 @@ jobs:
     - uses: dotnet/nbgv@master
       id: nbgv
 
-    - name: Diplay Package Version
+    - name: Display Package Version
       run: echo "PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}-ci.${{ steps.nbgv.outputs.VersionRevision }}"
 
 
@@ -69,7 +68,12 @@ jobs:
     - name: Build
       run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SimpleVersion }}-ci.${{ steps.nbgv.outputs.VersionRevision }}
     - name: Test
-      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal
-
+      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal /p:CollectCoverage=true --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura
 
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      env:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: alexhiggins732/IdentityServer8
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,6 @@ on:
     - "global.json"
     - "IdentityServer8.DotNet.ruleset"
     - "LICENSCE"
-    - "version.json"
     - "Nuget.config"
     - "SECURITY.md"
     - "SPONSORS.md"
@@ -57,17 +56,24 @@ jobs:
     - uses: dotnet/nbgv@master
       id: nbgv
 
-    - name: Diplay Package Version
-      run: echo "PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}-beta.${{ steps.nbgv.outputs.VersionRevision }}"
+    - name: Display Package Version
+      run: echo "PackageVersion=${{ steps.nbgv.outputs.SemVer2 }}"
 
 
 
     - name: Restore dependencies
       run: dotnet restore src/IdentityServer8.sln
     - name: Build
-      run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SimpleVersion }}-beta.${{ steps.nbgv.outputs.VersionRevision }}
+      run: dotnet build src/IdentityServer8.sln --configuration Release --no-restore -p:Version=${{ steps.nbgv.outputs.SemVer2 }}
     - name: Test
-      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal
+      run: dotnet test src/IdentityServer8.sln --configuration Release --no-build --verbosity normal /p:CollectCoverage=true --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=cobertura
+
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v4.0.1
+      env:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        slug: alexhiggins732/IdentityServer8
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
 
     - name: Push

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,8 +3,8 @@
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <!--always bump /version.json and /docs/conf.py to <Version>X.Y.Z</Version>to keep nuget, build and document versions in sync-->
-        <Version>8.0.3</Version>
-		<IdentityServerVersion>$(Version)</IdentityServerVersion>
+        <Version>8.0.4-beta.4</Version>
+		<IdentityServerVersion>8.0.4-beta.4</IdentityServerVersion>
         <PackageId>HigginsSoft.$(MSBuildProjectName)</PackageId>
         <Title>$(MSBuildProjectName)</Title>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -59,12 +59,14 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="$(AspnetMinorVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(AspnetVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspnetMinorVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(AspnetVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspnetVersion)" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspnetVersion)" />
@@ -101,6 +103,7 @@
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(AspnetVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(AspnetVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="$(AspnetMinorVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(AspireVersion)" />

diff --git a/LicenseHeader.txt b/LicenseHeader.txt
@@ -0,0 +1,11 @@
+/*
+ Copyright (c) 2024 HigginsSoft, Alexander Higgins - https://github.com/alexhiggins732/ 
+
+ Copyright (c) 2018, Brock Allen & Dominick Baier. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. 
+ Source code and license this software can be found 
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+*/
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # Identity Server 8 update
 This project is a DotNet 8 revival of the Identity Server 4 and Identity Server 4 Admin UI, for Open ID Connect (OIDC) and OAuth, which was archived when .NET Core 3.1 reached end of support.
 
+The latest verion, 8.0.4, is now available on NuGet. It contains [hundreds of security and bug fixes](https://github.com/alexhiggins732/IdentityServer8/blob/master/docs/CHANGELOG.md) from the original Identity Server 4 project.
+
+It is recommend you update all previous version, 4 or 8, to the latest version to ensure you have the latest security updates. 
+
 - [Documentation](http://identityserver8.readthedocs.io/)
 - [Support](https://identityserver8.readthedocs.io/en/latest/into/support.html)
 - [Gitter Chat](https://app.gitter.im/#/room/#identityserver8:gitter.im)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,12 +4,31 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning 2](http://semver.org/).
 
-## [Unreleased] - 2024-02-13
+## [Unreleased] - 2024-02-17
 
-Current templates and quickstarts will be added to seperate template and quickstart repositories to continue previous version functionality.
+- Current templates and quickstarts being added to seperate template and quickstart repositories to continue previous version functionality.
+- DotNet tool to install template currently under development.
+- 
+## [8.0.4] - 2024-02-17
 
-DotNet tool to install template currently under development.
+Identity Server 8.0.4 is a security release that addresses hundreds of security vulnerabilities in the IdentityServer8 code base. We recommend that you update to this version.
 
+- Fix over 100+ security vulnerabilities in the IdentityServer8 code base:
+ - #17 Unsafe expansion of self-closing HTML tag
+ - #18 URL redirection from remote source
+ - #19 DOM text reinterpreted as HTML
+ - #20 Incomplete string escaping or encoding
+ - #21 Inefficient regular expression bug dependencies
+ - #22 Bad HTML filtering regexp bug dependencies
+ - #23 User-controlled bypass of sensitive method bug
+ - #24 Unsafe jQuery plugins bug dependencies
+
+Additional the codebase has been refactored to use the latest DotNet 8 features and best practices. 
+
+This includes refactroing in #25 and consolidation of reused code that remove some nearly 1 million lines of code from the base.:
+- Convert Top Level usings
+- Convert Implicit usings.
+- Samples use shared API and MVC projects to reduce code duplication and need to maintain dozens of copies of the same code.
 
 ## [8.0.3] - 2024-02-12
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -71,7 +71,7 @@
 # The short X.Y version.
 version = '8.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '8.0.3'
+release = '8.0.4-beta.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -6,6 +6,9 @@ Welcome to IdentityServer8 (latest)
 
 IdentityServer8 is an OpenID Connect and OAuth 2.0 framework for ASP.NET DotNet 8.
 
+Browse the latest `IdentityServer8 source code onGitHub <https://github.com/alexhiggins732/IdentityServer8>`_ or download the `latest IdentyServer8 packages <https://www.nuget.org/packages/HigginsSoft.IdentityServer8//>`_ on NuGet.
+[
+
 .. warning:: 
    This is a revival of the archived IdentityServer4 project which started a new `company <https://duendesoftware.com/>`_ as of Oct, 1st 2020. 
    The new Duende IdentityServer is not longer free open source, but now has various commercial licenses and paid upgrade package.

diff --git a/samples/Clients/ClientsGlobalUsings.cs b/samples/Clients/ClientsGlobalUsings.cs
@@ -0,0 +1,13 @@
+/*
+ Copyright (c) 2024 HigginsSoft, Alexander Higgins - https://github.com/alexhiggins732/ 
+
+ Copyright (c) 2018, Brock Allen & Dominick Baier. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. 
+ Source code and license this software can be found 
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+*/
+
+global using Clients;
diff --git a/samples/Clients/Directory.Build.props b/samples/Clients/Directory.Build.props
@@ -1,5 +1,8 @@
 <Project>
-  <ImportGroup>
-	 <Import Project="../Directory.Build.props" />
-  </ImportGroup>
+    <ImportGroup>
+        <Import Project="../Directory.Build.props" />
+    </ImportGroup>
+	<ItemGroup>
+        <Compile Include="$(SolutionDir)..\ClientsGlobalUsings.cs" Link="ClientsGlobalUsings.cs" />
+    </ItemGroup>
 </Project>
diff --git a/samples/Clients/old/Clients.sln b/samples/Clients/old/Clients.sln
@@ -0,0 +1,90 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34322.80
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{179A2A2C-3B3D-437C-B5F3-3B81472C8335}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcHybrid", "MvcHybrid\MvcHybrid.csproj", "{926ACA55-AA27-475D-90CB-AC6D4B113322}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcHybridAutomaticRefresh", "MvcHybridAutomaticRefresh\MvcHybridAutomaticRefresh.csproj", "{AF1E5A26-F1DC-4B71-988D-F3B69F47D604}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcImplicit", "MvcImplicit\MvcImplicit.csproj", "{24B7CDFC-87B7-4C45-A73B-AA0D9FAD25B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcImplicitJwtRequest", "MvcImplicitJwtRequest\MvcImplicitJwtRequest.csproj", "{DD2BC29A-9874-4953-8AAC-9ABF8DE97F2F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcManual", "MvcManual\MvcManual.csproj", "{B3757E48-9817-4390-9A35-58D106C2D6E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{3CDFF45B-4773-419E-99DA-BE8545B7DECB}"
+	ProjectSection(SolutionItems) = preProject
+		..\..\..\Directory.Build.props = ..\..\..\Directory.Build.props
+		..\..\..\Directory.Packages.props = ..\..\..\Directory.Packages.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Constants", "..\shared\Constants\Constants.csproj", "{F2D39DF0-367D-456B-820F-2A081F7C1CC7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{66694F08-6E72-4D7B-A555-D4EB25A9CCC8}"
+	ProjectSection(SolutionItems) = preProject
+		..\..\Directory.Build.props = ..\..\Directory.Build.props
+		..\..\SamplesGlobalUsings.cs = ..\..\SamplesGlobalUsings.cs
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clients", "Clients", "{97D760DC-D81F-43D4-93D0-B81BD2112705}"
+	ProjectSection(SolutionItems) = preProject
+		..\ClientsGlobalUsings.cs = ..\ClientsGlobalUsings.cs
+		..\..\Directory.Build.props = ..\..\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "old", "old", "{B729491B-30F9-4DB3-B871-77BA9BA8BE8D}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		MvcUsings.cs = MvcUsings.cs
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{926ACA55-AA27-475D-90CB-AC6D4B113322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{926ACA55-AA27-475D-90CB-AC6D4B113322}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{926ACA55-AA27-475D-90CB-AC6D4B113322}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{926ACA55-AA27-475D-90CB-AC6D4B113322}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF1E5A26-F1DC-4B71-988D-F3B69F47D604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF1E5A26-F1DC-4B71-988D-F3B69F47D604}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF1E5A26-F1DC-4B71-988D-F3B69F47D604}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF1E5A26-F1DC-4B71-988D-F3B69F47D604}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24B7CDFC-87B7-4C45-A73B-AA0D9FAD25B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24B7CDFC-87B7-4C45-A73B-AA0D9FAD25B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24B7CDFC-87B7-4C45-A73B-AA0D9FAD25B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24B7CDFC-87B7-4C45-A73B-AA0D9FAD25B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD2BC29A-9874-4953-8AAC-9ABF8DE97F2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD2BC29A-9874-4953-8AAC-9ABF8DE97F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD2BC29A-9874-4953-8AAC-9ABF8DE97F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD2BC29A-9874-4953-8AAC-9ABF8DE97F2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3757E48-9817-4390-9A35-58D106C2D6E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3757E48-9817-4390-9A35-58D106C2D6E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3757E48-9817-4390-9A35-58D106C2D6E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3757E48-9817-4390-9A35-58D106C2D6E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2D39DF0-367D-456B-820F-2A081F7C1CC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2D39DF0-367D-456B-820F-2A081F7C1CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2D39DF0-367D-456B-820F-2A081F7C1CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2D39DF0-367D-456B-820F-2A081F7C1CC7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3CDFF45B-4773-419E-99DA-BE8545B7DECB} = {179A2A2C-3B3D-437C-B5F3-3B81472C8335}
+		{66694F08-6E72-4D7B-A555-D4EB25A9CCC8} = {3CDFF45B-4773-419E-99DA-BE8545B7DECB}
+		{97D760DC-D81F-43D4-93D0-B81BD2112705} = {66694F08-6E72-4D7B-A555-D4EB25A9CCC8}
+		{B729491B-30F9-4DB3-B871-77BA9BA8BE8D} = {97D760DC-D81F-43D4-93D0-B81BD2112705}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BAD78470-3D66-466E-9C17-2A67F0905B18}
+	EndGlobalSection
+EndGlobal
diff --git a/...anagement/KeyManagement.sln.licenseheader → ...les/Clients/old/Clients.sln.licenseheader b/...anagement/KeyManagement.sln.licenseheader → ...les/Clients/old/Clients.sln.licenseheader
diff --git a/samples/Clients/old/Directory.Build.props b/samples/Clients/old/Directory.Build.props
@@ -2,4 +2,8 @@
   <ImportGroup>
 	 <Import Project="../Directory.Build.props" />
   </ImportGroup>
+  <ItemGroup>
+      <Compile Include="$(SolutionDir)MvcUsings.cs" Link="MvcUsings.cs" />
+     <ProjectReference Include="$(SolutionDir)..\shared\Constants\Constants.csproj" Condition="$(MSBuildProjectName) != 'Constants' " />
+  </ItemGroup>
 </Project>