Skip to content

Commit 31d6dc4

Browse files
BrennanConroyBrennanConroy
authored
Merge branch 'release/6.0' into merge/release/6.0-rc2-to-release/6.0
2 parents ce73350 + f19197e commit 31d6dc4

File tree

20 files changed

+353
-222
lines changed

20 files changed

+353
-222
lines changed

‎.azure/pipelines/components-e2e-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ variables:
2727
jobs:
2828
- template: jobs/default-build.yml
2929
parameters:
30-
continueOnBuildError: true
3130
condition: ne(variables['SkipTests'], 'true')
3231
jobName: Components_E2E_Test
3332
jobDisplayName: "Test: Blazor E2E tests on Linux"

‎Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,13 @@
169169
<BuildDependsOn>$(BuildDependsOn);_CopySymbolsToArtifacts</BuildDependsOn>
170170
</PropertyGroup>
171171

172+
<!-- Properties for Package Validation -->
173+
<PropertyGroup Condition="'$(ExcludeFromSourceBuild)' != 'true'">
174+
<EnablePackageValidation>true</EnablePackageValidation>
175+
<DisablePackageBaselineValidation Condition="'$(IsServicingBuild)' != 'true'">true</DisablePackageBaselineValidation>
176+
<GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
177+
</PropertyGroup>
178+
172179
<Target Name="_CopySymbolsToArtifacts">
173180
<Copy SourceFiles="$([System.IO.Path]::ChangeExtension('$(TargetPath)', 'pdb'))"
174181
DestinationFolder="$(SymbolsOutputPath)$(TargetFramework)"

‎activate.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function deactivate ([switch]$init) {
2525
}
2626

2727
Remove-Item env:DOTNET_ROOT -ea ignore
28+
Remove-Item 'env:DOTNET_ROOT(x86)' -ea Ignore
2829
Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ea ignore
2930
if (-not $init) {
3031
# Remove the deactivate function

‎eng/Version.Details.xml

Lines changed: 132 additions & 132 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 73 additions & 74 deletions
Large diffs are not rendered by default.

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-rc.2.21457.23"
3+
"version": "6.0.100-rtm.21466.6"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-rc.2.21457.23",
6+
"dotnet": "6.0.100-rtm.21466.6",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

‎src/Caching/SqlServer/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/Components/Web.JS/dist/Release/blazor.server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,26 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
3737
];
3838

3939
this.modal.style.cssText = modalStyles.join(';');
40-
this.modal.innerHTML = '<h5 style="margin-top: 20px"></h5><button style="margin:5px auto 5px">Retry</button><p>Alternatively, <a href>reload</a></p>';
41-
this.message = this.modal.querySelector('h5')!;
42-
this.button = this.modal.querySelector('button')!;
43-
this.reloadParagraph = this.modal.querySelector('p')!;
40+
41+
this.message = this.document.createElement('h5') as HTMLHeadingElement;
42+
this.message.style.cssText = 'margin-top: 20px';
43+
44+
this.button = this.document.createElement('button') as HTMLButtonElement;
45+
this.button.style.cssText = 'margin:5px auto 5px';
46+
this.button.textContent = 'Retry';
47+
48+
const link = this.document.createElement('a');
49+
link.addEventListener('click', () => location.reload());
50+
link.textContent = 'reload';
51+
52+
this.reloadParagraph = this.document.createElement('p') as HTMLParagraphElement;
53+
this.reloadParagraph.textContent = 'Alternatively, ';
54+
this.reloadParagraph.appendChild(link);
55+
56+
this.modal.appendChild(this.message);
57+
this.modal.appendChild(this.button);
58+
this.modal.appendChild(this.reloadParagraph);
59+
4460
this.loader = this.getLoader();
4561

4662
this.message.after(this.loader);
@@ -63,7 +79,6 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
6379
this.failed();
6480
}
6581
});
66-
this.reloadParagraph.querySelector('a')!.addEventListener('click', () => location.reload());
6782
}
6883

6984
show(): void {
@@ -98,16 +113,34 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
98113
this.button.style.display = 'block';
99114
this.reloadParagraph.style.display = 'none';
100115
this.loader.style.display = 'none';
101-
this.message.innerHTML = 'Reconnection failed. Try <a href>reloading</a> the page if you\'re unable to reconnect.';
102-
this.message.querySelector('a')!.addEventListener('click', () => location.reload());
116+
117+
const errorDescription = this.document.createTextNode('Reconnection failed. Try ');
118+
119+
const link = this.document.createElement('a');
120+
link.textContent = 'reloading';
121+
link.setAttribute('href', '');
122+
link.addEventListener('click', () => location.reload());
123+
124+
const errorInstructions = this.document.createTextNode(' the page if you\'re unable to reconnect.');
125+
126+
this.message.replaceChildren(errorDescription, link, errorInstructions);
103127
}
104128

105129
rejected(): void {
106130
this.button.style.display = 'none';
107131
this.reloadParagraph.style.display = 'none';
108132
this.loader.style.display = 'none';
109-
this.message.innerHTML = 'Could not reconnect to the server. <a href>Reload</a> the page to restore functionality.';
110-
this.message.querySelector('a')!.addEventListener('click', () => location.reload());
133+
134+
const errorDescription = this.document.createTextNode('Could not reconnect to the server. ');
135+
136+
const link = this.document.createElement('a');
137+
link.textContent = 'Reload';
138+
link.setAttribute('href', '');
139+
link.addEventListener('click', () => location.reload());
140+
141+
const errorInstructions = this.document.createTextNode(' the page to restore functionality.');
142+
143+
this.message.replaceChildren(errorDescription, link, errorInstructions);
111144
}
112145

113146
private getLoader(): HTMLDivElement {

‎src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ function addGlobalModuleScriptTagsToDocument(callback: () => void) {
209209
// The callback is put in the global scope so that it can be run after the script is loaded.
210210
// onload cannot be used in this case for non-file scripts.
211211
window['__wasmmodulecallback__'] = callback;
212+
213+
// Note: Any updates to the following script will require updating the inline script hash if using CSP
212214
scriptElem.text = 'var Module; window.__wasmmodulecallback__(); delete window.__wasmmodulecallback__;';
213215

214216
document.body.appendChild(scriptElem);

‎src/Components/Web.JS/tests/DefaultReconnectDisplay.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe('DefaultReconnectDisplay', () => {
7676
expect(display.loader.style.display).toBe('none');
7777
});
7878

79-
it('update message with current attempt', () => {
79+
it('update message with current attempt', () => {
8080
const maxRetires = 6;
8181
const display = new DefaultReconnectDisplay('test-dialog-id', maxRetires, testDocument, NullLogger.instance);
8282

‎src/DataProtection/DataProtection/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/DataProtection/Extensions/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/DataProtection/StackExchangeRedis/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/Features/JsonPatch/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/FileProviders/Embedded/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22

3-
<Import Project="..\..\build\$(TargetFramework)\Microsoft.AspNetCore.Mvc.Testing.targets" />
3+
<Import Project="..\..\build\net6.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
44

55
</Project>

‎src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ namespace ComponentsWebAssembly_CSharp.Server.Controllers;
2121
#endif
2222
[ApiController]
2323
[Route("[controller]")]
24-
#if (OrganizationalAuth || IndividualB2CAuth)
24+
#if (OrganizationalAuth)
2525
[RequiredScope(RequiredScopesConfigurationKey = "AzureAd:Scopes")]
26+
#elseif (IndividualB2CAuth)
27+
[RequiredScope(RequiredScopesConfigurationKey = "AzureAdB2C:Scopes")]
2628
#endif
2729
public class WeatherForecastController : ControllerBase
2830
{

‎src/SignalR/common/Protocols.MessagePack/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

‎src/SignalR/common/Protocols.NewtonsoftJson/src/CompatibilitySuppressions.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP1002</DiagnosticId>
5+
<Target>System.ServiceModel.Internals.dll</Target>
6+
</Suppression>
7+
<Suppression>
8+
<DiagnosticId>CP1002</DiagnosticId>
9+
<Target>SMDiagnostics.dll</Target>
10+
</Suppression>
11+
</Suppressions>

0 commit comments

Comments
 (0)