Skip to content

Commit 71853a4

Browse files
pranavkmpranavkm
committed
Merge branch '3.1merge'
2 parents 237dff2 + 949b5e0 commit 71853a4

File tree

21 files changed

+44
-88
lines changed

21 files changed

+44
-88
lines changed

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

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

‎eng/Baseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Update this list when preparing for a new patch.
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
1010
<Package Id="dotnet-sql-cache" Version="3.1.5" />
11+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
1112
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
1213
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
1314
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />

‎eng/Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@
123123
the entire pattern will silently fail to evaluate correctly.
124124
-->
125125
<DotNetProjects Include="
126-
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
127-
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;
126+
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
127+
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
128+
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
128129
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
129130
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
130131
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;

‎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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<!-- WebDriver is not strong-named, so this test project cannot be strong named either. -->
1313
<SignAssembly>false</SignAssembly>
14+
<IsTestAssetProject>true</IsTestAssetProject>
15+
<IsPackable>false</IsPackable>
1416
</PropertyGroup>
1517

1618
<ItemGroup>

‎src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<HasReferenceAssembly>false</HasReferenceAssembly>
88
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
99
<ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
10+
<IsTestAssetProject>true</IsTestAssetProject>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎src/Components/test/E2ETest/e2eTestSettings.json

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
}

‎src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5+
<IsShippingPackage>false</IsShippingPackage>
6+
<IsPackable>true</IsPackable>
7+
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
8+
<PackageId>$(TargetingPackName).Internal</PackageId>
9+
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
10+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
11+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
<IncludeBuildOutput>false</IncludeBuildOutput>
13+
<IncludeSymbols>false</IncludeSymbols>
14+
<NoPackageAnalysis>true</NoPackageAnalysis>
15+
</PropertyGroup>
16+
17+
</Project>

‎src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj renamed to ‎src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
66
<IsPackable>true</IsPackable>
77
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
8+
<!-- This is typically based on whether the project sits in a folder named `ref`, which this one does not - but we want it to resolve references like a ref project -->
9+
<IsReferenceAssemblyProject>true</IsReferenceAssemblyProject>
810
<PackageId>$(TargetingPackName)</PackageId>
911
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
1012
<!-- This is a reference package and does not include any dependencies. -->
@@ -59,7 +61,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
5961
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
6062
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
6163
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
62-
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
64+
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
6365
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6466
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6567
</ProjectReference>

0 commit comments

Comments
 (0)