Skip to content
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

servicing for .NET 6.0.4 SDK update. #1889

Merged
merged 7 commits into from
May 9, 2022
Merged

servicing for .NET 6.0.4 SDK update. #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a06ff4c
Add Downstream API option for Blazor WASM code modifier config (#1871)
zahalzel Apr 7, 2022
d88dcfd
bumping System.Security.Cryptography.X509Certificates version (#1873)
deepchoudhery Apr 12, 2022
9944eba
throwing exception if GetConnectionString returns null. (#1876)
deepchoudhery Apr 14, 2022
27b674d
Adding Blazor Wasm Hosted scenario (#1878)
zahalzel Apr 27, 2022
81f39bb
Enabling nullable templates (#1887)
deepchoudhery May 9, 2022
855d2de
minor updates
deepchoudhery May 9, 2022
065f3a4
bumping Versions.props
deepchoudhery May 9, 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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

<ItemGroup>
<PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="$(SystemSecurityCryptographyX509CertificatesVersion)"/>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/Versions.MSIdentity.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>1.0.3</VersionPrefix>
<VersionPrefix>1.0.4</VersionPrefix>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
<!--
Expand Down
3 changes: 2 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Ref packages -->
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>6.0.3</VersionPrefix>
<VersionPrefix>6.0.4</VersionPrefix>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
<!--
Expand Down Expand Up @@ -117,6 +117,7 @@
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
<SystemSecurityCryptographyX509CertificatesVersion>4.3.0</SystemSecurityCryptographyX509CertificatesVersion>
</PropertyGroup>
<!-- Package versions for MSIdentity projects-->
<PropertyGroup>
Expand Down
5 changes: 1 addition & 4 deletions ...Scaffolding/Microsoft.DotNet.MSIdentity/AuthenticationParameters/ApplicationParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ public string? Domain1
/// Is authenticated with Azure AD B2C (set by reflection).
/// </summary>
public bool IsB2C { get; set; }


// TODO: propose a fix for the blazorwasm project template

/// <summary>
/// Sign-up/sign-in policy in the case of B2C.
Expand Down Expand Up @@ -157,7 +154,7 @@ public string? Domain1
/// <summary>
/// Identifier URIs for web APIs.
/// </summary>
public string? AppIdUri { set; get; }
public string? AppIdUri { get; set; }

/// <summary>
/// API permissions.
Expand Down
112 changes: 79 additions & 33 deletions ...rosoft.DotNet.MSIdentity/CodeReaderWriter/CodeModifierConfigs/cm_dotnet_blazorserver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"Files": [
{
"FileName": "Program.cs",
"Options": [ "MinimalApp" ],
"Options": [
"MinimalApp"
],
"Methods": {
"Global": {
"CodeChanges": [
Expand All @@ -19,7 +21,7 @@
"WebApplication.CreateBuilder.Services.AddRazorPages",
"WebApplication.CreateBuilder.Build"
],
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
Expand All @@ -30,15 +32,15 @@
"WebApplication.CreateBuilder.Services.AddAuthorization",
"WebApplication.CreateBuilder.Services.AddRazorPages"
],
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
{
"Block": "AddMicrosoftIdentityWebApp(builder.Configuration.GetSection(\"AzureAd\"))",
"Parent": "WebApplication.CreateBuilder.Services.AddAuthentication",
"CodeChangeType": "MemberAccess",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
Expand All @@ -49,16 +51,16 @@
"WebApplication.CreateBuilder.Services.AddAuthorization",
"WebApplication.CreateBuilder.Services.AddRazorPages",
"WebApplication.CreateBuilder.Build"
],
"CodeFormatting": {
],
"LeadingTrivia": {
"Newline": true
}
},
{
"Block": "AddMicrosoftIdentityUI()",
"Parent": "WebApplication.CreateBuilder.Services.AddControllersWithViews",
"CodeChangeType":"MemberAccess",
"CodeFormatting": {
"CodeChangeType": "MemberAccess",
"LeadingTrivia": {
"Newline": true
}
},
Expand All @@ -70,7 +72,7 @@
"DownstreamApi"
],
"Block": "EnableTokenAcquisitionToCallDownstreamApi(initialScopes)",
"CodeFormatting": {
"LeadingTrivia": {
"NumberOfSpaces": 8,
"Newline": true
}
Expand All @@ -81,28 +83,32 @@
"Options": [
"MicrosoftGraph"
],
"Block": "AddMicrosoftGraph(builder.Configuration.GetSection(\"MicrosoftGraph\"))\r\n .AddInMemoryTokenCaches()",
"CodeFormatting": {
"NumberOfSpaces": 12,
"MultiLineBlock": [
" AddMicrosoftGraph(builder.Configuration.GetSection(\"MicrosoftGraph\"))",
" .AddInMemoryTokenCaches()"
],
"LeadingTrivia": {
"Newline": true
}
},
{
"Parent": "EnableTokenAcquisitionToCallDownstreamApi(initialScopes)",
"Parent": "EnableTokenAcquisitionToCallDownstreamApi",
"CodeChangeType": "MemberAccess",
"Options": [
"DownstreamApi"
],
"Block": "AddDownstreamWebApi(\"DownstreamApi\",builder.Configuration.GetSection(\"DownstreamApi\"))\r\n .AddInMemoryTokenCaches()",
"CodeFormatting": {
"NumberOfSpaces": 12,
"MultiLineBlock": [
" AddDownstreamWebApi(\"DownstreamApi\",builder.Configuration.GetSection(\"DownstreamApi\"))",
" .AddInMemoryTokenCaches()"
],
"LeadingTrivia": {
"Newline": true
}
},
{
"Block": "WebApplication.CreateBuilder.Services.AddAuthorization()",
"InsertAfter": "WebApplication.CreateBuilder.Services.AddControllersWithViews",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
Expand All @@ -111,7 +117,7 @@
"Parameter": "options",
"CodeChangeType": "Lambda",
"Parent": "WebApplication.CreateBuilder.Services.AddAuthorization",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true,
"NumberOfSpaces": 4
}
Expand All @@ -120,29 +126,29 @@
"Block": "AddMicrosoftIdentityConsentHandler()",
"Parent": "WebApplication.CreateBuilder.Services.AddServerSideBlazor()",
"CodeChangeType": "MemberAccess",
"CodeFormatting":{
"LeadingTrivia": {
"Newline": true,
"NumberOfSpaces": 4
}
},
{
"Block": "app.UseAuthentication()",
"InsertAfter": "app.UseRouting()",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
{
"Block": "app.UseAuthorization()",
"InsertAfter": "app.UseAuthentication()",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
},
{
"Block": "app.MapControllers()",
"InsertAfter": "app.UseAuthorization",
"CodeFormatting": {
"LeadingTrivia": {
"Newline": true
}
}
Expand All @@ -162,12 +168,22 @@
"FileName": "App.razor",
"Replacements": [
{
"Block": "<CascadingAuthenticationState>\r\n <Router AppAssembly=\"@typeof(App).Assembly\">",
"ReplaceSnippet": "<Router AppAssembly=\"@typeof(App).Assembly\">"
"MultiLineBlock": [
"<CascadingAuthenticationState>",
" <Router AppAssembly=\"@typeof(App).Assembly\">"
],
"ReplaceSnippet": [
"<Router AppAssembly=\"@typeof(App).Assembly\">"
]
},
{
"Block":" </Router>\r\n</CascadingAuthenticationState>",
"ReplaceSnippet": "</Router>"
"MultiLineBlock": [
" </Router>",
"</CascadingAuthenticationState>"
],
"ReplaceSnippet": [
"</Router>"
]
}
]
},
Expand All @@ -179,15 +195,38 @@
],
"Replacements": [
{
"Block": "</NavLink>\r\n </div>\r\n <div class=\"nav-item px-3\">\r\n <NavLink class=\"nav-link\" href=\"showprofile\">\r\n <span class=\"oi oi-list-rich\" aria-hidden=\"true\"></span> Show profile\r\n </NavLink>\r\n </div>\r\n </nav>\r\n</div>",
"ReplaceSnippet": "</NavLink>\r\n </div>\r\n </nav>\r\n</div>",
"MultiLineBlock": [
"</NavLink>",
" </div>",
" <div class=\"nav-item px-3\">",
" <NavLink class=\"nav-link\" href=\"showprofile\">",
" <span class=\"oi oi-person\" aria-hidden=\"true\"></span> Show profile",
" </NavLink>",
" </div>",
" </nav>",
"</div>"
],
"ReplaceSnippet": [
"</NavLink>",
" </div>",
" </nav>",
"</div>"
],
"Options": [
"MicrosoftGraph"
]
},
{
"Block": "</NavLink>\r\n </div>\r\n <div class=\"nav-item px-3\">\r\n <NavLink class=\"nav-link\" href=\"callwebapi\">\r\n <span class=\"oi oi-list-rich\" aria-hidden=\"true\"></span> Call Web API\r\n </NavLink>\r\n </div>\r\n </nav>\r\n</div>",
"ReplaceSnippet": "</NavLink>\r\n </div>\r\n </nav>\r\n</div>",
"MultiLineBlock": [
"<NavLink class=\"nav-link\" href=\"callwebapi\">",
" <span class=\"oi oi-list-rich\" aria-hidden=\"true\"></span> Call Web API",
" </NavLink>"
],
"ReplaceSnippet": [
"<NavLink class=\"nav-link\" href=\"fetchdata\">",
" <span class=\"oi oi-list-rich\" aria-hidden=\"true\"></span> Fetch data",
" </NavLink>"
],
"Options": [
"DownstreamApi"
]
Expand All @@ -198,8 +237,15 @@
"FileName": "MainLayout.razor",
"Replacements": [
{
"Block": " <main>\r\n <div class=\"top-row px-4 auth\">\r\n <LoginDisplay />",
"ReplaceSnippet": " <main>\r\n <div class=\"top-row px-4\">"
"MultiLineBlock": [
" <main>",
" <div class=\"top-row px-4 auth\">",
" <LoginDisplay />"
],
"ReplaceSnippet": [
" <main>",
" <div class=\"top-row px-4\">"
]
}
]
},
Expand All @@ -222,4 +268,4 @@
]
}
]
}
}
Loading