Skip to content

Commit 592dfe1

Browse files
pranavkmpranavkm
committed
Changes to build in master
* Cleanup bad merge * Update to dotnet-serve that supports arbitrary ports
1 parent 4c50b6c commit 592dfe1

File tree

112 files changed

+981
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+981
-159
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-serve": {
6-
"version": "1.5.0",
6+
"version": "1.7.125",
77
"commands": [
88
"dotnet-serve"
99
]

‎eng/Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
$(RepoRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
2727
$(RepoRoot)src\Components\Web.JS\node_modules\**\*.*proj;
2828
$(RepoRoot)src\Components\WebAssembly\Build\testassets\**\*.csproj;
29-
$(RepoRoot)src\ProjectTemplates\ComponentsWebAssembly.ProjectTemplates\content\**\*.csproj;
3029
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.csproj;
3130
$(RepoRoot)src\ProjectTemplates\Web.ProjectTemplates\content\**\*.fsproj;
3231
$(RepoRoot)src\ProjectTemplates\Web.Spa.ProjectTemplates\content\**\*.csproj;

‎eng/ProjectReferences.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />
7070
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
7171
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
72+
<ProjectReferenceProvider Include="System.Net.Http.WebAssemblyHttpHandler" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj" />
7273
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
7374
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" />
7475
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<Uri>https://github.com/dotnet/blazor</Uri>
1414
<Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
1515
</Dependency>
16-
<Dependency Name="System.Net.Http.Json" Version="3.2.0">
17-
<Uri>https://github.com/dotnet/corefx</Uri>
18-
<Sha>66409e392d64ed96e5d3a5fda712d9baf51196ed</Sha>
19-
</Dependency>
2016
<Dependency Name="dotnet-ef" Version="5.0.0-preview.6.20276.2">
2117
<Uri>https://github.com/dotnet/efcore</Uri>
2218
<Sha>46636e00447b1303e1ea439b68bfada1cdcb8393</Sha>
@@ -209,6 +205,10 @@
209205
<Uri>https://github.com/dotnet/runtime</Uri>
210206
<Sha>c44dc40b763b7c74012622a0a6120cd8ffa35ce4</Sha>
211207
</Dependency>
208+
<Dependency Name="System.Net.Http.Json" Version="5.0.0-preview.6.20271.10">
209+
<Uri>https://github.com/dotnet/runtime</Uri>
210+
<Sha>66409e392d64ed96e5d3a5fda712d9baf51196ed</Sha>
211+
</Dependency>
212212
<Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.6.20271.10">
213213
<Uri>https://github.com/dotnet/runtime</Uri>
214214
<Sha>c44dc40b763b7c74012622a0a6120cd8ffa35ce4</Sha>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
3131
<IsServicingBuild Condition=" '$(DisableServicingFeatures)' != 'true' AND '$(PreReleaseVersionLabel)' == 'servicing' ">true</IsServicingBuild>
3232
<VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
33-
<ComponentsWebAssemblyVersionPrefix>$(ComponentsWebAssemblyMajorVersion).$(ComponentsWebAssemblyMinorVersion).$(ComponentsWebAssemblyPatchVersion)</ComponentsWebAssemblyVersionPrefix>
3433
<!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. -->
3534
<TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix>
3635
<!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. -->
@@ -112,6 +111,7 @@
112111
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.6.20271.10</SystemDiagnosticsEventLogPackageVersion>
113112
<SystemDrawingCommonPackageVersion>5.0.0-preview.6.20271.10</SystemDrawingCommonPackageVersion>
114113
<SystemIOPipelinesPackageVersion>5.0.0-preview.6.20271.10</SystemIOPipelinesPackageVersion>
114+
<SystemNetHttpJsonPackageVersion>5.0.0-preview.6.20271.10</SystemNetHttpJsonPackageVersion>
115115
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.6.20271.10</SystemNetHttpWinHttpHandlerPackageVersion>
116116
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.6.20271.10</SystemNetWebSocketsWebSocketProtocolPackageVersion>
117117
<SystemReflectionMetadataPackageVersion>5.0.0-preview.6.20271.10</SystemReflectionMetadataPackageVersion>

‎eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
297297
if ($msbuildCmd -ne $null) {
298298
# Workaround for https://github.com/dotnet/roslyn/issues/35793
299299
# Due to this issue $msbuildCmd.Version returns 0.0.0.0 for msbuild.exe 16.2+
300-
$msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split(@('-', '+'))[0])
300+
$msbuildVersion = [Version]::new((Get-Item $msbuildCmd.Path).VersionInfo.ProductVersion.Split([char[]]@('-', '+'))[0])
301301

302302
if ($msbuildVersion -ge $vsMinVersion) {
303303
return $global:_MSBuildExe = $msbuildCmd.Path

‎eng/scripts/CodeCheck.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ try {
139139
| ? {
140140
# These .sln files are used by the templating engine.
141141
($_.Name -ne "BlazorServerWeb_CSharp.sln") -and
142-
($_.Name -ne "BlazorWasm-CSharp.sln")
142+
($_.Name -ne "ComponentsWebAssembly-CSharp.sln")
143143
} `
144144
| % {
145145
Write-Host " Checking $(Split-Path -Leaf $_)"

‎global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
],
1212
"dotnet/x86": [
1313
"$(MicrosoftNETCoreAppInternalPackageVersion)"
14+
],
15+
"aspnetcore/x64": [
16+
"3.1.0"
17+
],
18+
"aspnetcore/x86": [
19+
"3.1.0"
1420
]
1521
},
1622
"Git": "2.22.0",

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

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Components/Web.JS/dist/Release/blazor.webassembly.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/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<MSBuild
105105
Projects="..\..\Compression\src\Microsoft.AspNetCore.Components.WebAssembly.Build.BrotliCompression.csproj"
106106
Targets="Publish"
107-
Properties="Configuration=$(Configuration);TargetFramework=netcoreapp3.1;PublishDir=$(_BrotliToolsOutputPath)">
107+
Properties="Configuration=$(Configuration);TargetFramework=$(DefaultNetCoreTargetFramework);PublishDir=$(_BrotliToolsOutputPath)">
108108
</MSBuild>
109109

110110
</Target>

‎src/Components/WebAssembly/Build/test/BuildIntegrationTests/BuildCompressionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public async Task Publish_WithLinkerAndCompression_UpdatesFilesWhenSourcesChange
220220
{
221221
// Arrange
222222
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary" });
223-
project.TargetFramework = "netcoreapp3.1";
223+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
224224
var result = await MSBuildProcessManager.DotnetMSBuild(project, target: "publish");
225225

226226
Assert.BuildPassed(result);
@@ -260,7 +260,7 @@ public async Task Publish_WithoutLinkerAndCompression_UpdatesFilesWhenSourcesCha
260260
{
261261
// Arrange
262262
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary" });
263-
project.TargetFramework = "netcoreapp3.1";
263+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
264264
var result = await MSBuildProcessManager.DotnetMSBuild(project, target: "publish", args: "/p:BlazorWebAssemblyEnableLinking=false");
265265

266266
Assert.BuildPassed(result);

‎src/Components/WebAssembly/Build/test/BuildIntegrationTests/BuildIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public async Task Build_Hosted_Works()
160160
{
161161
// Arrange
162162
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
163-
project.TargetFramework = "netcoreapp3.1";
163+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
164164
var result = await MSBuildProcessManager.DotnetMSBuild(project);
165165

166166
Assert.BuildPassed(result);

‎src/Components/WebAssembly/Build/test/BuildIntegrationTests/ProjectDirectory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static void CopyDirectory(DirectoryInfo source, DirectoryInfo destination, bool
110110

111111
static void SetupDirectoryBuildFiles(string repoRoot, string testAppsRoot, string projectDestination)
112112
{
113-
var razorSdkDirectoryRoot = Assembly.GetExecutingAssembly().GetCustomAttributes<AssemblyMetadataAttribute>().SingleOrDefault(a => a.Key == "RazorSdkDirectoryRoot").Value;
113+
var razorSdkDirectoryRoot = TestFacts.RazorSdkDirectoryRoot;
114114
var beforeDirectoryPropsContent =
115115
$@"<Project>
116116
<PropertyGroup>

‎src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public async Task Publish_HostedApp_WithLinkOnBuildTrue_Works()
288288
{
289289
// Arrange
290290
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
291-
project.TargetFramework = "netcoreapp3.1";
291+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
292292
var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish");
293293
AddSiblingProjectFileContent(project, @"
294294
<PropertyGroup>
@@ -337,7 +337,7 @@ public async Task Publish_HostedApp_WithLinkOnBuildFalse_Works()
337337
{
338338
// Arrange
339339
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
340-
project.TargetFramework = "netcoreapp3.1";
340+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
341341

342342
AddSiblingProjectFileContent(project, @"
343343
<PropertyGroup>
@@ -396,7 +396,7 @@ public async Task Publish_HostedApp_WithNoBuild_Works()
396396
{
397397
// Arrange
398398
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
399-
project.TargetFramework = "netcoreapp3.1";
399+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
400400
var result = await MSBuildProcessManager.DotnetMSBuild(project, "Build");
401401

402402
Assert.BuildPassed(result);
@@ -438,7 +438,7 @@ public async Task Publish_HostedApp_VisualStudio()
438438
// Simulates publishing the same way VS does by setting BuildProjectReferences=false.
439439
// Arrange
440440
using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
441-
project.TargetFramework = "netcoreapp3.1";
441+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
442442
project.Configuration = "Release";
443443
var result = await MSBuildProcessManager.DotnetMSBuild(project, "Build", "/p:BuildInsideVisualStudio=true");
444444

@@ -483,7 +483,7 @@ public async Task Publish_HostedApp_VisualStudio_WithSatelliteAssemblies()
483483
// Simulates publishing the same way VS does by setting BuildProjectReferences=false.
484484
// Arrange
485485
var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", "classlibrarywithsatelliteassemblies" });
486-
project.TargetFramework = "netcoreapp3.1";
486+
project.TargetFramework = TestFacts.DefaultNetCoreTargetFramework;
487487
project.Configuration = "Release";
488488
var standaloneProjectDirectory = Path.Combine(project.DirectoryPath, "..", "standalone");
489489

‎src/Components/WebAssembly/Build/test/BuildIntegrationTests/TestFacts.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System.Linq;
5+
using System.Reflection;
6+
7+
namespace Microsoft.AspNetCore.Components.WebAssembly.Build
8+
{
9+
public static class TestFacts
10+
{
11+
public static string DefaultNetCoreTargetFramework =>
12+
GetAttributeValue(nameof(DefaultNetCoreTargetFramework));
13+
14+
public static string RazorSdkDirectoryRoot =>
15+
GetAttributeValue(nameof(RazorSdkDirectoryRoot));
16+
17+
private static string GetAttributeValue(string name)
18+
{
19+
return Assembly
20+
.GetExecutingAssembly()
21+
.GetCustomAttributes<AssemblyMetadataAttribute>()
22+
.FirstOrDefault(a => a.Key == $"Testing.{name}")
23+
.Value;
24+
}
25+
}
26+
}

‎src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -28,7 +28,6 @@
2828
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" />
2929
<Reference Include="Microsoft.Build.Framework" />
3030
<Reference Include="Microsoft.Build.Utilities.Core" />
31-
<Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
3231
<!-- Avoid CS1705 errors due to mix of assemblies brought in transitively. -->
3332
<Reference Include="Microsoft.AspNetCore.Components" />
3433
</ItemGroup>
@@ -46,14 +45,19 @@
4645
</AssemblyAttribute>
4746

4847
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
49-
<_Parameter1>RazorSdkDirectoryRoot</_Parameter1>
48+
<_Parameter1>Testing.RazorSdkDirectoryRoot</_Parameter1>
5049
<_Parameter2>$(ArtifactsBinDir)Microsoft.NET.Sdk.Razor\$(Configuration)\sdk-output\</_Parameter2>
5150
</AssemblyAttribute>
5251

5352
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
5453
<_Parameter1>Testing.MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion</_Parameter1>
5554
<_Parameter2>$(MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion)</_Parameter2>
5655
</AssemblyAttribute>
56+
57+
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
58+
<_Parameter1>Testing.DefaultNetCoreTargetFramework</_Parameter1>
59+
<_Parameter2>$(DefaultNetCoreTargetFramework)</_Parameter2>
60+
</AssemblyAttribute>
5761
</ItemGroup>
5862

5963
<Target Name="RestoreTestAssets" AfterTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">

‎src/Components/WebAssembly/Build/test/RuntimeDependenciesResolverTest.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Linq;
88
using System.Reflection;
99
using System.Text;
10+
using Microsoft.AspNetCore.Testing.xunit;
1011
using Xunit;
1112

1213
namespace Microsoft.AspNetCore.Components.WebAssembly.Build
@@ -43,13 +44,9 @@ implementations 100% forwarding to mscorlib.dll. Then in development you'd fetch
4344
uncalled implementation code from mscorlib.dll anyway.
4445
*/
4546
"Microsoft.AspNetCore.Components.dll",
46-
"Microsoft.AspNetCore.Components.pdb",
4747
"Microsoft.AspNetCore.Components.Forms.dll",
48-
"Microsoft.AspNetCore.Components.Forms.pdb",
4948
"Microsoft.AspNetCore.Components.Web.dll",
50-
"Microsoft.AspNetCore.Components.Web.pdb",
5149
"Microsoft.AspNetCore.Components.WebAssembly.dll",
52-
"Microsoft.AspNetCore.Components.WebAssembly.pdb",
5350
"Microsoft.Bcl.AsyncInterfaces.dll",
5451
"Microsoft.Extensions.Configuration.Abstractions.dll",
5552
"Microsoft.Extensions.Configuration.dll",
@@ -66,12 +63,10 @@ uncalled implementation code from mscorlib.dll anyway.
6663
"Microsoft.Extensions.Primitives.dll",
6764
"Microsoft.JSInterop.dll",
6865
"Microsoft.JSInterop.WebAssembly.dll",
69-
"Microsoft.JSInterop.WebAssembly.pdb",
7066
"Mono.Security.dll",
7167
"mscorlib.dll",
7268
"netstandard.dll",
7369
"StandaloneApp.dll",
74-
"StandaloneApp.pdb",
7570
"System.dll",
7671
"System.Buffers.dll",
7772
"System.ComponentModel.Annotations.dll",
@@ -113,6 +108,7 @@ uncalled implementation code from mscorlib.dll anyway.
113108

114109
var contents = paths
115110
.Select(p => Path.GetFileName(p))
111+
.Where(p => Path.GetExtension(p) != ".pdb")
116112
.OrderBy(i => i, StringComparer.Ordinal)
117113
.ToArray();
118114

‎src/Components/WebAssembly/Compression/src/Microsoft.AspNetCore.Components.WebAssembly.Build.BrotliCompression.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<AssemblyName>blazor-brotli</AssemblyName>
77
<IsShippingPackage>false</IsShippingPackage>
88
<HasReferenceAssembly>false</HasReferenceAssembly>
9-
<MicrosoftNETCoreAppRuntimeVersion>3.1.0</MicrosoftNETCoreAppRuntimeVersion>
109
</PropertyGroup>
1110

1211
</Project>

‎src/Components/WebAssembly/DebugProxy/src/Microsoft.AspNetCore.Components.WebAssembly.DebugProxy.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@
1212
<NoWarn>$(NoWarn);CS0649</NoWarn>
1313
</PropertyGroup>
1414

15+
<ItemGroup>
16+
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
17+
</ItemGroup>
18+
1519
<ItemGroup>
1620
<Reference Include="Microsoft.AspNetCore" />
1721
<Reference Include="Microsoft.AspNetCore.WebSockets" />
18-
<Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
1922
<Reference Include="Microsoft.Extensions.Hosting" />
2023

2124
<!-- Dependencies of ws-proxy sources -->

‎src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<Reference Include="Microsoft.AspNetCore.Components.Server" />
2121
<Reference Include="Microsoft.AspNetCore.ResponseCompression" />
2222
<Reference Include="Microsoft.AspNetCore" />
23-
<Reference Include="Microsoft.Extensions.Hosting" />
2423

2524
<Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
2625
<Reference Include="Microsoft.Extensions.Hosting" />

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project>
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
33
<PropertyGroup>
4-
<!-- Override version labels -->
5-
<VersionPrefix>$(ComponentsWebAssemblyVersionPrefix)</VersionPrefix>
6-
74
<!-- Avoid source build issues with WebAssembly -->
85
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
96
</PropertyGroup>

‎src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
55
<NoWarn>$(NoWarn);BL0005;BL0006</NoWarn>
66
<!-- Avoid CS1705 errors due to mix of assemblies brought in transitively. -->
77
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>

‎src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@
1111
<ItemGroup>
1212
<Reference Include="Microsoft.AspNetCore.Components.Web" />
1313
<Reference Include="Microsoft.Extensions.Configuration.Json" />
14+
<Reference Include="Microsoft.Extensions.Configuration.Binder" />
1415
<Reference Include="Microsoft.Extensions.Logging" />
1516
<Reference Include="Microsoft.JSInterop.WebAssembly" />
16-
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" IncludeAssets="compile" />
17+
18+
<!-- Tracking removing using https://github.com/dotnet/aspnetcore/issues/22283 -->
19+
<ProjectReference
20+
Include="..\..\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj"
21+
IncludeAssets="compile" />
22+
23+
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" />
1724
</ItemGroup>
1825

1926
<ItemGroup>

‎src/Components/WebAssembly/WebAssemblyHttpHandler/src/Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<AssemblyVersion>0.2.2.0</AssemblyVersion>
88
<ProduceOnlyReferenceAssembly>true</ProduceOnlyReferenceAssembly>
99
<StrongNameKeyId>Open</StrongNameKeyId>
10-
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/Components/WebAssembly/testassets/MonoSanity/MonoSanity.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<ItemGroup>
1212
<Reference Include="Microsoft.AspNetCore" />
1313
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
14-
<Reference Include="Microsoft.Extensions.Hosting" />
15-
<Reference Include="Microsoft.Extensions.Hosting" />
1614
</ItemGroup>
1715

1816
</Project>

0 commit comments

Comments
 (0)