Skip to content

Commit 87326bc

Browse files
committed
Merge remote-tracking branch 'origin/release/3.1'
2 parents 9ab99b2 + 22cdfd6 commit 87326bc

File tree

3 files changed

+63
-0
lines changed

3 files changed

+63
-0
lines changed

.azure/pipelines/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,9 @@ stages:
772772
pool:
773773
vmImage: 'ubuntu-18.04'
774774
variables:
775+
LC_ALL: 'en_US.UTF-8'
776+
LANG: 'en_US.UTF-8'
777+
LANGUAGE: 'en_US.UTF-8'
775778
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
776779
# This isn't needed in the path because build does not need to _use_ global tools.
777780
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)

.azure/pipelines/jobs/default-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@ jobs:
138138
- DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
139139
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
140140
- TeamName: AspNetCore
141+
- ${{ if eq(parameters.agentOs, 'Linux') }}:
142+
- LC_ALL: 'en_US.UTF-8'
143+
- LANG: 'en_US.UTF-8'
144+
- LANGUAGE: 'en_US.UTF-8'
145+
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
146+
- JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
141147
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
142148
- _SignType: ''
143149
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:

src/SignalR/clients/ts/signalr/tests/TestWebSocket.ts

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,3 +285,57 @@ export class TestMessageEvent implements MessageEvent {
285285
public CAPTURING_PHASE: number = 0;
286286
public NONE: number = 0;
287287
}
288+
289+
export class TestMessageEvent implements MessageEvent {
290+
constructor(data: any) {
291+
this.data = data;
292+
}
293+
public data: any;
294+
public lastEventId: string = "";
295+
public origin: string = "";
296+
public ports: MessagePort[] = [];
297+
public source: Window | null = null;
298+
public composed: boolean = false;
299+
public composedPath(): EventTarget[];
300+
public composedPath(): any[] {
301+
throw new Error("Method not implemented.");
302+
}
303+
public code: number = 0;
304+
public reason: string = "";
305+
public wasClean: boolean = false;
306+
public initMessageEvent(typeArg: string, canBubbleArg: boolean, cancelableArg: boolean, data: any, origin: string, lastEventId: string): void {
307+
throw new Error("Method not implemented.");
308+
}
309+
public bubbles: boolean = false;
310+
public cancelBubble: boolean = false;
311+
public cancelable: boolean = false;
312+
public currentTarget!: EventTarget;
313+
public defaultPrevented: boolean = false;
314+
public eventPhase: number = 0;
315+
public isTrusted: boolean = false;
316+
public returnValue: boolean = false;
317+
public scoped: boolean = false;
318+
public srcElement!: Element | null;
319+
public target!: EventTarget;
320+
public timeStamp: number = 0;
321+
public type: string = "";
322+
public deepPath(): EventTarget[] {
323+
throw new Error("Method not implemented.");
324+
}
325+
public initEvent(type: string, bubbles?: boolean | undefined, cancelable?: boolean | undefined): void {
326+
throw new Error("Method not implemented.");
327+
}
328+
public preventDefault(): void {
329+
throw new Error("Method not implemented.");
330+
}
331+
public stopImmediatePropagation(): void {
332+
throw new Error("Method not implemented.");
333+
}
334+
public stopPropagation(): void {
335+
throw new Error("Method not implemented.");
336+
}
337+
public AT_TARGET: number = 0;
338+
public BUBBLING_PHASE: number = 0;
339+
public CAPTURING_PHASE: number = 0;
340+
public NONE: number = 0;
341+
}

0 commit comments

Comments
 (0)