Skip to content

Relayer packages to remove dependencies for adapters #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 16, 2022
Merged

Relayer packages to remove dependencies for adapters #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
713219e
Relayer packages to remove dependencies for adapters
twsouthwick Jul 29, 2022
9271c8a
Merge remote-tracking branch 'origin/main' into tasou/create-extensio…
twsouthwick Aug 9, 2022
e8980db
add net45
twsouthwick Aug 10, 2022
24568f8
Merge remote-tracking branch 'origin/main' into tasou/create-extensio…
twsouthwick Aug 10, 2022
28ad69c
separate out CoreServices/FrameworkServices
twsouthwick Aug 15, 2022
ca99407
remove suffix
twsouthwick Aug 15, 2022
f9c74f7
Move session serializer
twsouthwick Aug 15, 2022
9aa13cf
Add nuget config
twsouthwick Aug 15, 2022
2d65a4e
fix up slnf
twsouthwick Aug 15, 2022
c5ee45b
add cls compliance
twsouthwick Aug 15, 2022
0aa0096
add internals to dynamicproxy
twsouthwick Aug 15, 2022
6a6a4cb
update readme
twsouthwick Aug 15, 2022
8547c0d
Update readme
twsouthwick Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions Microsoft.AspNetCore.SystemWebAdapters.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32127.271
Expand Down Expand Up @@ -26,13 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvcCoreApp", "samples\MvcCo
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F9DB9323-C919-49E8-8F96-B923D2F42E60}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A1BDA50C-D70B-416C-97F1-74B0649797C5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.SessionState", "src\Microsoft.AspNetCore.SystemWebAdapters.SessionState\Microsoft.AspNetCore.SystemWebAdapters.SessionState.csproj", "{2029D409-07E3-49F8-BB6A-77114DE7B337}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.SessionState.Tests", "test\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Tests\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Tests.csproj", "{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.SessionState.Framework.Tests", "test\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Framework.Tests\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Framework.Tests.csproj", "{FE535287-999D-4D43-B41C-22AB4A6E2D15}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A1BDA50C-D70B-416C-97F1-74B0649797C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteBearer", "samples\RemoteAuth\Bearer\RemoteBearer\RemoteBearer.csproj", "{898C9B2C-E43A-434F-9927-F6697C0ACE40}"
EndProject
Expand All @@ -46,7 +39,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OIDCAuth", "samples\RemoteA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OIDCAuthCore", "samples\RemoteAuth\OIDC\OIDCAuthCore\OIDCAuthCore.csproj", "{32192715-5F15-4E11-B96F-971468DA33E6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.Framework.Tests", "test\Microsoft.AspNetCore.SystemWebAdapters.Framework.Tests\Microsoft.AspNetCore.SystemWebAdapters.Framework.Tests.csproj", "{23036CE4-A4D7-4A42-868A-1FB5211A41F0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests", "test\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj", "{23036CE4-A4D7-4A42-868A-1FB5211A41F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.CoreServices", "src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj", "{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests", "test\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj", "{26FC1002-759D-4086-A694-DA15927B6BA0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RemoteAuth", "RemoteAuth", "{25382551-D3BE-46C0-AAB5-8D2C64D4EDDD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bearer", "Bearer", "{BB4A1FCC-9C83-4622-854C-987069F66BB3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{78F7011B-1C83-4AFC-B163-32420EB10ECA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OIDC", "OIDC", "{134659FA-F2BB-4E54-BB68-49E88EA2778F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices", "src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj", "{6931FEFB-DC18-4B3F-8AFC-EDA03063A518}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -74,18 +81,6 @@ Global
{B1D06F62-B315-4ED8-8109-168B4D4E4B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1D06F62-B315-4ED8-8109-168B4D4E4B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1D06F62-B315-4ED8-8109-168B4D4E4B86}.Release|Any CPU.Build.0 = Release|Any CPU
{2029D409-07E3-49F8-BB6A-77114DE7B337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2029D409-07E3-49F8-BB6A-77114DE7B337}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2029D409-07E3-49F8-BB6A-77114DE7B337}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2029D409-07E3-49F8-BB6A-77114DE7B337}.Release|Any CPU.Build.0 = Release|Any CPU
{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC}.Release|Any CPU.Build.0 = Release|Any CPU
{FE535287-999D-4D43-B41C-22AB4A6E2D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE535287-999D-4D43-B41C-22AB4A6E2D15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE535287-999D-4D43-B41C-22AB4A6E2D15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE535287-999D-4D43-B41C-22AB4A6E2D15}.Release|Any CPU.Build.0 = Release|Any CPU
{898C9B2C-E43A-434F-9927-F6697C0ACE40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{898C9B2C-E43A-434F-9927-F6697C0ACE40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{898C9B2C-E43A-434F-9927-F6697C0ACE40}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -114,6 +109,18 @@ Global
{23036CE4-A4D7-4A42-868A-1FB5211A41F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23036CE4-A4D7-4A42-868A-1FB5211A41F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23036CE4-A4D7-4A42-868A-1FB5211A41F0}.Release|Any CPU.Build.0 = Release|Any CPU
{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E}.Release|Any CPU.Build.0 = Release|Any CPU
{26FC1002-759D-4086-A694-DA15927B6BA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26FC1002-759D-4086-A694-DA15927B6BA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26FC1002-759D-4086-A694-DA15927B6BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26FC1002-759D-4086-A694-DA15927B6BA0}.Release|Any CPU.Build.0 = Release|Any CPU
{6931FEFB-DC18-4B3F-8AFC-EDA03063A518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6931FEFB-DC18-4B3F-8AFC-EDA03063A518}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6931FEFB-DC18-4B3F-8AFC-EDA03063A518}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6931FEFB-DC18-4B3F-8AFC-EDA03063A518}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -124,16 +131,20 @@ Global
{11DD4D64-7A95-4635-A273-775715E18852} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{174A36F1-27ED-43FC-A3A1-00DA58C4E30C} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{B1D06F62-B315-4ED8-8109-168B4D4E4B86} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{2029D409-07E3-49F8-BB6A-77114DE7B337} = {F9DB9323-C919-49E8-8F96-B923D2F42E60}
{9AFF3DCE-5DEF-4337-B5BC-C98ABEA6BEDC} = {A1BDA50C-D70B-416C-97F1-74B0649797C5}
{FE535287-999D-4D43-B41C-22AB4A6E2D15} = {A1BDA50C-D70B-416C-97F1-74B0649797C5}
{898C9B2C-E43A-434F-9927-F6697C0ACE40} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{6ECC8509-2937-4667-AECC-C20BA62D3FC5} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{87223E5F-A0B2-4827-A4A4-B4C40BEAFBE8} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{EB87A63B-D71F-43E3-B0B7-588B4BED3BE3} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{0BA8335A-9F56-4439-9A71-4BD5B58C2273} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{32192715-5F15-4E11-B96F-971468DA33E6} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{898C9B2C-E43A-434F-9927-F6697C0ACE40} = {BB4A1FCC-9C83-4622-854C-987069F66BB3}
{6ECC8509-2937-4667-AECC-C20BA62D3FC5} = {BB4A1FCC-9C83-4622-854C-987069F66BB3}
{87223E5F-A0B2-4827-A4A4-B4C40BEAFBE8} = {78F7011B-1C83-4AFC-B163-32420EB10ECA}
{EB87A63B-D71F-43E3-B0B7-588B4BED3BE3} = {78F7011B-1C83-4AFC-B163-32420EB10ECA}
{0BA8335A-9F56-4439-9A71-4BD5B58C2273} = {134659FA-F2BB-4E54-BB68-49E88EA2778F}
{32192715-5F15-4E11-B96F-971468DA33E6} = {134659FA-F2BB-4E54-BB68-49E88EA2778F}
{23036CE4-A4D7-4A42-868A-1FB5211A41F0} = {A1BDA50C-D70B-416C-97F1-74B0649797C5}
{A01BA50E-E4C8-4EEA-A4E2-C2312BC6B02E} = {F9DB9323-C919-49E8-8F96-B923D2F42E60}
{26FC1002-759D-4086-A694-DA15927B6BA0} = {A1BDA50C-D70B-416C-97F1-74B0649797C5}
{25382551-D3BE-46C0-AAB5-8D2C64D4EDDD} = {95915611-30BF-4AFF-AE41-5CDC6F57DCF7}
{BB4A1FCC-9C83-4622-854C-987069F66BB3} = {25382551-D3BE-46C0-AAB5-8D2C64D4EDDD}
{78F7011B-1C83-4AFC-B163-32420EB10ECA} = {25382551-D3BE-46C0-AAB5-8D2C64D4EDDD}
{134659FA-F2BB-4E54-BB68-49E88EA2778F} = {25382551-D3BE-46C0-AAB5-8D2C64D4EDDD}
{6931FEFB-DC18-4B3F-8AFC-EDA03063A518} = {F9DB9323-C919-49E8-8F96-B923D2F42E60}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DABA3C65-9D74-4EB6-9B1C-730328710EAD}
Expand Down
9 changes: 5 additions & 4 deletions Microsoft.AspNetCore.SystemWebAdapters.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
"solution": {
"path": "Microsoft.AspNetCore.SystemWebAdapters.sln",
"projects": [
"src\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj",
"src\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj",
"src\\Microsoft.AspNetCore.SystemWebAdapters\\Microsoft.AspNetCore.SystemWebAdapters.csproj",
"test\\Microsoft.AspNetCore.SystemWebAdapters.Tests\\Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj",
"src\\Microsoft.AspNetCore.SystemWebAdapters.SessionState\\Microsoft.AspNetCore.SystemWebAdapters.SessionState.csproj",
"test\\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Framework.Tests\\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Framework.Tests.csproj",
"test\\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Tests\\Microsoft.AspNetCore.SystemWebAdapters.SessionState.Tests.csproj"
"test\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests\\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj",
"test\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests\\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj",
"test\\Microsoft.AspNetCore.SystemWebAdapters.Tests\\Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj"
]
}
}
14 changes: 7 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
This project provides a collection of adapters that help migrating from `System.Web.dll` based ASP.NET projects to ASP.NET Core projects. The adapters currently include:

- `Microsoft.AspNetCore.SystemWebAdapters`: Subset of the APIs from `System.Web.dll` backed by `Microsoft.AspNetCore.Http` types
- `Microsoft.AspNetCore.SystemWebAdapters.SessionState`: Support for `System.Web.HttpContext.Session` usage
- `Microsoft.AspNetCore.SystemWebAdapters.CoreServices`: Support for adding services to ASP.NET Core applications to enable migration efforts
- `Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices`: Support for adding services to ASP.NET Framework applications to enable migration efforts

These adapters help enable large scale, incremental migration from ASP.NET to ASP.NET Core. For more details on incremental migration from ASP.NET to ASP.NET Core, please see the [documentation](docs).

Expand All @@ -27,15 +28,14 @@ Below are the steps needed to start using the System.Web adapters with your ASP.
</packageSources>
</configuration>
```
2. Install `Microsoft.AspNetCore.SystemWebAdapters`
3. If you use `HttpContext.Session`, install `Microsoft.AspNetCore.SystemWebAdapters.SessionState`
4. In your framework application:
- The package installation will add a new module to your `web.config`. This module handles any customizations that are required to help migrate to .NET Core. See [this](docs/framework.md) for details on what is available here.
5. In your class libraries:
2. Install `Microsoft.AspNetCore.SystemWebAdapters` to supporting libraries
- Class libraries can target .NET Standard 2.0 if desired which will ensure you are using the shared surface area
- If you find that there's still some missing APIs, you may cross-compile with .NET Framework to maintain that behavior and handle it in .NET core in some other way
- There should be no manual changes to enable using supported surface area of the adapters. If a member is not found, it is not currently supported on ASP.NET Core
6. For your ASP.NET Core application:
3. Install `Microsoft.AspNetCore.SystemWebAdapters.CoreServices` to your ASP.NET Core application
4. Install `Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices` to your ASP.NET Framework application
- The package installation will add a new module to your `web.config`. This module handles any customizations that are required to help migrate to .NET Core. See [this](docs/framework.md) for details on what is available here.
5. For your ASP.NET Core application:
- Register the adapter services:
```csharp
builder.Services.AddSystemWebAdapters();
Expand Down
6 changes: 3 additions & 3 deletions samples/MvcApp/MvcApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@
<Content Include="Scripts\jquery-3.4.1.min.map" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.SessionState\Microsoft.AspNetCore.SystemWebAdapters.SessionState.csproj">
<Project>{2029d409-07e3-49f8-bb6a-77114de7b337}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters.SessionState</Name>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj">
<Project>{6931fefb-dc18-4b3f-8afc-eda03063a518}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj">
<Project>{55c1bbe0-b922-46b0-8f2c-8472bc9a5f33}</Project>
Expand Down
10 changes: 3 additions & 7 deletions samples/MvcCoreApp/MvcCoreApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.SessionState\Microsoft.AspNetCore.SystemWebAdapters.SessionState.csproj" />
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
<ProjectReference Include="..\ClassLibrary\ClassLibrary.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 4 additions & 0 deletions samples/RemoteAuth/Bearer/RemoteBearer/RemoteBearer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj">
<Project>{6931fefb-dc18-4b3f-8afc-eda03063a518}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj">
<Project>{55c1bbe0-b922-46b0-8f2c-8472bc9a5f33}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters</Name>
Expand Down
7 changes: 2 additions & 5 deletions samples/RemoteAuth/Bearer/RemoteBearerCore/RemoteBearerCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 4 additions & 0 deletions samples/RemoteAuth/Forms/FormsAuth/FormsAuth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj">
<Project>{6931fefb-dc18-4b3f-8afc-eda03063a518}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj">
<Project>{55c1bbe0-b922-46b0-8f2c-8472bc9a5f33}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters</Name>
Expand Down
9 changes: 4 additions & 5 deletions samples/RemoteAuth/Forms/FormsAuthCore/FormsAuthCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj" />
<PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
</ItemGroup>

</Project>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions samples/RemoteAuth/OIDC/OIDCAuth/OIDCAuth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj">
<Project>{6931fefb-dc18-4b3f-8afc-eda03063a518}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj">
<Project>{55c1bbe0-b922-46b0-8f2c-8472bc9a5f33}</Project>
<Name>Microsoft.AspNetCore.SystemWebAdapters</Name>
Expand Down
8 changes: 2 additions & 6 deletions samples/RemoteAuth/OIDC/OIDCAuthCore/OIDCAuthCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj" />
<ProjectReference Include="..\..\..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
</ItemGroup>

</Project>
</Project>
3 changes: 3 additions & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="..\Directory.Build.props" />
</Project>
16 changes: 16 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project>
<PropertyGroup>
<UseSharedServices Condition=" '$(UseSharedServices)' == '' ">false</UseSharedServices>
<SharedServiceDirectory>$(MSBuildThisFileDirectory)Services</SharedServiceDirectory>
</PropertyGroup>

<ItemGroup>
<SharedServices Include="$(SharedServiceDirectory)/**/*.cs" />

<Compile Condition="$(UseSharedServices)" Include="@(SharedServices)">
<Link>$([MSBuild]::MakeRelative($(SharedServiceDirectory), %(FullPath)))</Link>
</Compile>
</ItemGroup>

<Import Project="..\Directory.Build.targets" />
</Project>
0 ...ntication/IAuthenticationResultFactory.cs → ...ntication/IAuthenticationResultFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...RemoteAppAuthenticationResultProcessor.cs → ...RemoteAppAuthenticationResultProcessor.cs
View file
Open in desktop
File renamed without changes.
0 ...cation/IRemoteAppAuthenticationService.cs → ...cation/IRemoteAppAuthenticationService.cs
View file
Open in desktop
File renamed without changes.
0 ...ion/RemoteAppAuthenticationAuthHandler.cs → ...ion/RemoteAppAuthenticationAuthHandler.cs
View file
Open in desktop
File renamed without changes.
0 ...n/RemoteAppAuthenticationClientOptions.cs → ...n/RemoteAppAuthenticationClientOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...cation/RemoteAppAuthenticationDefaults.cs → ...cation/RemoteAppAuthenticationDefaults.cs
View file
Open in desktop
File renamed without changes.
0 ...tion/RemoteAppAuthenticationExtensions.cs → ...tion/RemoteAppAuthenticationExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...tication/RemoteAppAuthenticationResult.cs → ...tication/RemoteAppAuthenticationResult.cs
View file
Open in desktop
File renamed without changes.
0 ...n/RemoteAppAuthenticationResultFactory.cs → ...n/RemoteAppAuthenticationResultFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...ication/RemoteAppAuthenticationService.cs → ...ication/RemoteAppAuthenticationService.cs
View file
Open in desktop
File renamed without changes.
0 .../ResultProcessors/RedirectUrlProcessor.cs → .../ResultProcessors/RedirectUrlProcessor.cs
View file
Open in desktop
File renamed without changes.
0 ...Adapters/BufferResponseStreamAttribute.cs → ...Services/BufferResponseStreamAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...dapters/BufferResponseStreamMiddleware.cs → ...ervices/BufferResponseStreamMiddleware.cs
View file
Open in desktop
File renamed without changes.
0 ...rs/Adapters/CurrentPrincipalMiddleware.cs → ...oreServices/CurrentPrincipalMiddleware.cs
View file
Open in desktop
File renamed without changes.
0 ...Adapters/DefaultCacheControlMiddleware.cs → ...Services/DefaultCacheControlMiddleware.cs
View file
Open in desktop
File renamed without changes.
0 ...ers/Adapters/HttpRequestAdapterFeature.cs → ...CoreServices/HttpRequestAdapterFeature.cs
View file
Open in desktop
File renamed without changes.
0 ...emWebAdapters/Adapters/ISessionManager.cs → ...bAdapters.CoreServices/ISessionManager.cs
View file
Open in desktop
File renamed without changes.
0 ...SystemWebAdapterRemoteClientAppBuilder.cs → ...SystemWebAdapterRemoteClientAppBuilder.cs
View file
Open in desktop
File renamed without changes.
Loading