Skip to content

Commit 39bc827

Browse files
AArnottAArnott
committed
Fixes web.config references to OpenID behaviors that have changed name.
Also adds a build task that fixes up references to the unified assembly.
1 parent 378db56 commit 39bc827

File tree

16 files changed

+25
-20
lines changed

16 files changed

+25
-20
lines changed

‎nuget/content/web.config.transform

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<behaviors>
5757
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
5858
with OPs that use Attribute Exchange (in various formats). -->
59-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
59+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth" />
6060
</behaviors>
6161
</relyingParty>
6262
</openid>

‎projecttemplates/MvcRelyingParty/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<behaviors>
6666
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
6767
with OPs that use Attribute Exchange (in various formats). -->
68-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth"/>
68+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty"/>
6969
</behaviors>
7070
<store type="RelyingPartyLogic.RelyingPartyApplicationDbStore, RelyingPartyLogic"/>
7171
</relyingParty>

‎projecttemplates/WebFormsRelyingParty/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<behaviors>
6969
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
7070
with OPs that use Attribute Exchange (in various formats). -->
71-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
71+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
7272
</behaviors>
7373
<store type="RelyingPartyLogic.RelyingPartyApplicationDbStore, RelyingPartyLogic"/>
7474
</relyingParty>

‎samples/OpenIdProviderMvc/Web.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<!-- Behaviors activate themselves automatically for individual matching requests.
5050
The first one in this list to match an incoming request "owns" the request. If no
5151
profile matches, the default behavior is assumed. -->
52-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProfile, DotNetOpenAuth" />-->
53-
<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth" />
54-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
52+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProviderProfile, DotNetOpenAuth.OpenId.Provider" />-->
53+
<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />
54+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregProviderTransform, DotNetOpenAuth.OpenId.Provider" />
5555
</behaviors>
5656
<!-- Uncomment the following to activate the sample custom store. -->
5757
<!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->

‎samples/OpenIdProviderWebForms/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Behaviors activate themselves automatically for individual matching requests.
5050
The first one in this list to match an incoming request "owns" the request. If no
5151
profile matches, the default behavior is assumed. -->
52-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth" />-->
52+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->
5353
</behaviors>
5454
<!-- Uncomment the following to activate the sample custom store. -->
5555
<!--<store type="OpenIdProviderWebForms.Code.CustomStore, OpenIdProviderWebForms" />-->

‎samples/OpenIdRelyingPartyMvc/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<behaviors>
5353
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
5454
with OPs that use Attribute Exchange (in various formats). -->
55-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
55+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
5656
</behaviors>
5757
</relyingParty>
5858
</openid>

‎samples/OpenIdRelyingPartyWebForms/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
4444
with OPs that use Attribute Exchange (in various formats). -->
4545
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
46-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProfile, DotNetOpenAuth" />-->
46+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamRelyingPartyProfile, DotNetOpenAuth.OpenId.RelyingParty" />-->
4747
</behaviors>
4848
<!-- Uncomment the following to activate the sample custom store. -->
4949
<!--<store type="OpenIdRelyingPartyWebForms.Code.CustomStore, OpenIdRelyingPartyWebForms" />-->

‎samples/OpenIdRelyingPartyWebFormsVB/Web.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<behaviors>
4343
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
4444
with OPs that use Attribute Exchange (in various formats). -->
45-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
46-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProfile, DotNetOpenAuth" />-->
45+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
46+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamRelyingPartyProfile, DotNetOpenAuth.OpenId.RelyingParty" />-->
4747
</behaviors>
4848
<!-- Uncomment the following to activate the sample custom store. -->
4949
<!--<store type="OpenIdRelyingPartyWebFormsVB.CustomStore, OpenIdRelyingPartyWebFormsVB" />-->

‎samples/OpenIdWebRingSsoProvider/Web.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<!-- Behaviors activate themselves automatically for individual matching requests.
5050
The first one in this list to match an incoming request "owns" the request. If no
5151
profile matches, the default behavior is assumed. -->
52-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth" />-->
52+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />-->
5353
</behaviors>
5454
</provider>
5555
</openid>

‎samples/OpenIdWebRingSsoRelyingParty/Web.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<behaviors>
5555
<!-- The following OPTIONAL behavior allows RPs to use SREG only, but be compatible
5656
with OPs that use Attribute Exchange (in various formats). -->
57-
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth" />
58-
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamProfile, DotNetOpenAuth" />-->
57+
<add type="DotNetOpenAuth.OpenId.Behaviors.AXFetchAsSregRelyingPartyTransform, DotNetOpenAuth.OpenId.RelyingParty" />
58+
<!--<add type="DotNetOpenAuth.OpenId.Behaviors.GsaIcamRelyingPartyProfile, DotNetOpenAuth.OpenId.RelyingParty" />-->
5959
</behaviors>
6060
<!-- Uncomment the following to activate the sample custom store. -->
6161
<!--<store type="OpenIdRelyingPartyWebForms.CustomStore, OpenIdRelyingPartyWebForms" />-->

‎src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<Compile Include="OpenId\Behaviors\AXFetchAsSregTransform.cs" />
23+
<Compile Include="OpenId\Behaviors\AXFetchAsSregProviderTransform.cs" />
2424
<Compile Include="OpenId\Behaviors\GsaIcamProviderProfile.cs" />
2525
<Compile Include="OpenId\Behaviors\PpidGeneration.cs" />
2626
<Compile Include="OpenId\ChannelElements\AssociateUnencryptedProviderRequest.cs" />

‎src/DotNetOpenAuth.OpenId.Provider/OpenId/Behaviors/AXFetchAsSregTransform.cs ‎src/DotNetOpenAuth.OpenId.Provider/OpenId/Behaviors/AXFetchAsSregProviderTransform.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//-----------------------------------------------------------------------
2-
// <copyright file="AXFetchAsSregTransform.cs" company="Andrew Arnott">
2+
// <copyright file="AXFetchAsSregProviderTransform.cs" company="Andrew Arnott">
33
// Copyright (c) Andrew Arnott. All rights reserved.
44
// </copyright>
55
//-----------------------------------------------------------------------

‎src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<Compile Include="OpenId\Behaviors\AXFetchAsSregTransform.cs" />
23+
<Compile Include="OpenId\Behaviors\AXFetchAsSregRelyingPartyTransform.cs" />
2424
<Compile Include="OpenId\Behaviors\GsaIcamRelyingPartyProfile.cs" />
2525
<Compile Include="OpenId\ChannelElements\ExtensionsBindingElementRelyingParty.cs" />
2626
<Compile Include="OpenId\ChannelElements\OpenIdRelyingPartyChannel.cs" />

‎src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Behaviors/AXFetchAsSregTransform.cs ‎src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Behaviors/AXFetchAsSregRelyingPartyTransform.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//-----------------------------------------------------------------------
2-
// <copyright file="AXFetchAsSregTransform.cs" company="Andrew Arnott">
2+
// <copyright file="AXFetchAsSregRelyingPartyTransform.cs" company="Andrew Arnott">
33
// Copyright (c) Andrew Arnott. All rights reserved.
44
// </copyright>
55
//-----------------------------------------------------------------------

‎src/DotNetOpenAuth.OpenId/OpenId/Behaviors/AXFetchAsSregTransform.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace DotNetOpenAuth.OpenId.Behaviors {
2121
/// to the originally requested extension and format.
2222
/// </summary>
2323
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sreg", Justification = "Abbreviation")]
24-
public class AXFetchAsSregTransform {
24+
public abstract class AXFetchAsSregTransform {
2525
/// <summary>
2626
/// Initializes static members of the <see cref="AXFetchAsSregTransform"/> class.
2727
/// </summary>
@@ -32,7 +32,7 @@ static AXFetchAsSregTransform() {
3232
/// <summary>
3333
/// Initializes a new instance of the <see cref="AXFetchAsSregTransform"/> class.
3434
/// </summary>
35-
public AXFetchAsSregTransform() {
35+
protected AXFetchAsSregTransform() {
3636
}
3737

3838
/// <summary>

‎tools/drop.proj

+5
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@
146146
Pattern='xmlns\:(.+)assembly=DotNetOpenAuth([^;"]+)'
147147
Replacement='xmlns:$1assembly=DotNetOpenAuth'
148148
Condition=" '%(Extension)' == '.xaml' " />
149+
<RegexFileReplace
150+
Files="@(DropSamplesFiles)"
151+
Pattern='type=&quot;DotNetOpenAuth([^,]+), DotNetOpenAuth([^&quot;]+)&quot;'
152+
Replacement='type=&quot;DotNetOpenAuth$1, DotNetOpenAuth&quot;'
153+
Condition=" '%(Extension)' == '.config' " />
149154
<DowngradeProjects
150155
Projects="@(SampleProjectTargets);@(SampleSolutionTargets)"
151156
DowngradeMvc2ToMvc1="$(DowngradeMvc2ToMvc1)"

0 commit comments

Comments
 (0)