Skip to content

Commit dc0a3e0

Browse files
authored
Address PR feedback (#22466)
1 parent 1656b4b commit dc0a3e0

File tree

3 files changed

+6
-45
lines changed

3 files changed

+6
-45
lines changed

eng/Baseline.Designer.props

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -150,45 +150,6 @@
150150
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
151151
<BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[3.1.4, )" />
152152
</ItemGroup>
153-
<!-- Package: Microsoft.AspNetCore.Blazor-->
154-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor' ">
155-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
156-
</PropertyGroup>
157-
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor' AND '$(TargetFramework)' == 'netstandard2.1' ">
158-
<BaselinePackageReference Include="Mono.WebAssembly.Interop" Version="[3.2.0-preview1.20073.1, )" />
159-
<BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.0, )" />
160-
<BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.0, )" />
161-
</ItemGroup>
162-
<!-- Package: Microsoft.AspNetCore.Blazor.Build-->
163-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.Build' ">
164-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
165-
</PropertyGroup>
166-
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.Build' AND '$(TargetFramework)' == 'any' ">
167-
<BaselinePackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="[3.2.0-preview1.20067.1, )" />
168-
</ItemGroup>
169-
<!-- Package: Microsoft.AspNetCore.Blazor.DevServer-->
170-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.DevServer' ">
171-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
172-
</PropertyGroup>
173-
<!-- Package: Microsoft.AspNetCore.Blazor.HttpClient-->
174-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.HttpClient' ">
175-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
176-
</PropertyGroup>
177-
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.HttpClient' AND '$(TargetFramework)' == 'netstandard2.0' ">
178-
<BaselinePackageReference Include="System.Text.Json" Version="[4.7.0, )" />
179-
</ItemGroup>
180-
<!-- Package: Microsoft.AspNetCore.Blazor.Server-->
181-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.Server' ">
182-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
183-
</PropertyGroup>
184-
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.Server' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
185-
<BaselinePackageReference Include="Mono.Cecil" Version="[0.10.1, )" />
186-
<BaselinePackageReference Include="Newtonsoft.Json" Version="[12.0.2, )" />
187-
</ItemGroup>
188-
<!-- Package: Microsoft.AspNetCore.Blazor.Templates-->
189-
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Blazor.Templates' ">
190-
<BaselinePackageVersion>3.2.0-preview1.20073.1</BaselinePackageVersion>
191-
</PropertyGroup>
192153
<!-- Package: Microsoft.AspNetCore.Components-->
193154
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' ">
194155
<BaselinePackageVersion>3.1.4</BaselinePackageVersion>

eng/Baseline.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ Update this list when preparing for a new patch.
2626
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.4" />
2727
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.4" />
2828
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.4" />
29-
<Package Id="Microsoft.AspNetCore.Blazor" Version="3.2.0-preview1.20073.1" />
30-
<Package Id="Microsoft.AspNetCore.Blazor.Build" Version="3.2.0-preview1.20073.1" />
31-
<Package Id="Microsoft.AspNetCore.Blazor.DevServer" Version="3.2.0-preview1.20073.1" />
32-
<Package Id="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
33-
<Package Id="Microsoft.AspNetCore.Blazor.Server" Version="3.2.0-preview1.20073.1" />
34-
<Package Id="Microsoft.AspNetCore.Blazor.Templates" Version="3.2.0-preview1.20073.1" />
3529
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.4" />
3630
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.4" />
3731
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.4" />

eng/targets/CSharp.Common.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
</Target>
3030

3131
<Choose>
32+
<!--
33+
C# 8.0's nullable annotations only work for .NET Core 3.0+ by default. However it can be made to work for other target frameworks
34+
by compiling the annotations (as internal types).
35+
The code block that follows sets it up so projects in this repo that target ns2.0 or netfx can compile when Nullable is configured.
36+
Based on https://github.com/dotnet/runtime/blob/93b6c449d4f31ddd7d573d1d3769e681d5ebceb9/src/libraries/Directory.Build.targets#L215-L222
37+
-->
3238
<When Condition="'$(Nullable)' != '' AND ('$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFrameworkIdentifier)' == '.NETFramework')">
3339
<PropertyGroup>
3440
<DefineConstants>$(DefineConstants),INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>

0 commit comments

Comments
 (0)