Skip to content

Commit fe8865a

Browse files
committed
Changes per PR
1 parent 0394a45 commit fe8865a

File tree

9 files changed

+10
-76
lines changed

9 files changed

+10
-76
lines changed

.azure/pipelines/blazor-daily-tests.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ jobs:
155155
- ${{ if and(eq(parameters.installTar, 'true'), eq(parameters.agentOs, 'Windows')) }}:
156156
- powershell: ./eng/scripts/InstallTar.ps1
157157
displayName: Find or install Tar
158+
- ${{ if eq(parameters.agentOs, 'Windows') }}:
159+
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
160+
displayName: Add dotnet tools to path
161+
- ${{ if ne(parameters.agentOs, 'Windows') }}:
162+
- script: echo "##vso[task.prependpath]$(DOTNET_CLI_HOME)/.dotnet/tools"
163+
displayName: Add dotnet tools to path
158164

159165
- ${{ parameters.beforeBuild }}
160166

src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
<PropertyGroup>
66
<TargetFramework>netstandard2.1</TargetFramework>
77
<Description>Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C</Description>
8-
<IsShippingPackage>true</IsShippingPackage>
9-
<HasReferenceAssembly>false</HasReferenceAssembly>
108
<RazorLangVersion>3.0</RazorLangVersion>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
129
</PropertyGroup>
1310

1411
<ItemGroup>

src/Components/WebAssembly/testassets/Directory.Build.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55

6-
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
76
<OutputType>exe</OutputType>
87

98
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->

src/Components/benchmarkapps/Wasm.Performance/benchmarks.compose.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"blazorwasmbenchmark": {
1212
"source": {
1313
"repository": "https://github.com/dotnet/AspNetCore.git",
14-
"branchOrCommit": "blazor-wasm",
14+
"branchOrCommit": "release/3.1",
1515
"dockerfile": "src/Components/benchmarkapps/Wasm.Performance/dockerfile"
1616
},
1717
"buildArguments": [
18-
"gitBranch=blazor-wasm"
18+
"gitBranch=release/3.1"
1919
],
2020
"waitForExit": true,
2121
"readyStateText": "Application started."

src/Components/benchmarkapps/Wasm.Performance/dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt-get update \
1212
nodejs \
1313
git
1414

15-
ARG gitBranch=blazor-wasm
15+
ARG gitBranch=release/3.1
1616

1717
WORKDIR /src
1818
ADD https://api.github.com/repos/dotnet/aspnetcore/git/ref/heads/${gitBranch} /aspnetcore.commit

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
88
<TestGroupName>Components.E2ETests</TestGroupName>
99

10-
<!-- This is so that we add the FrameworkReference to Microsoft.AspNetCore.App -->
11-
<UseLatestAspNetCoreReference>true</UseLatestAspNetCoreReference>
12-
1310
<!-- https://github.com/aspnet/AspNetCore/issues/6857 -->
1411
<BuildHelixPayload>false</BuildHelixPayload>
1512

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"DefaultWaitTimeoutInSeconds": 20,
3-
"ScreenShotsPath": "../../screenshots",
3+
"ScreenShotsPath": "../../screenshots"
44
}

0 commit comments

Comments
 (0)