Skip to content

Commit

Permalink
Fix merge issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
@IEvangelist
IEvangelist committed Nov 17, 2023
1 parent 407d40e commit 3c8fc17
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 55 deletions.
10 changes: 8 additions & 2 deletions samples/BlazorServer.ExampleConsumer/GlobalUsings.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
// Copyright (c) David Pine. All rights reserved.
// Licensed under the MIT License.

global using System.Diagnostics;
global using System.Text.Json;
global using System.Text.Json.Serialization;
global using Microsoft.JSInterop;
global using Microsoft.AspNetCore.Components;

global using BlazorServer.ExampleConsumer.Models;

global using Microsoft.AspNetCore.Components;
global using Microsoft.AspNetCore.Mvc;
global using Microsoft.AspNetCore.Mvc.RazorPages;
global using Microsoft.JSInterop;

global using static System.Globalization.CultureInfo;
7 changes: 2 additions & 5 deletions samples/BlazorServer.ExampleConsumer/Pages/Error.cshtml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
// Copyright (c) David Pine. All rights reserved.
// Licensed under the MIT License.

using System.Diagnostics;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;

namespace BlazorServer.ExampleConsumer.Pages;

[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
[IgnoreAntiforgeryToken]
public class ErrorModel(ILogger<ErrorModel> logger) : PageModel
public class ErrorModel : PageModel
{
public string? RequestId { get; set; }

Expand Down
91 changes: 43 additions & 48 deletions src/Blazor.SourceGenerators/Blazor.SourceGenerators.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,58 +14,53 @@
<!-- Do not include the generator as a lib dependency -->
<IncludeBuildOutput>false</IncludeBuildOutput>

<NeutralLanguage>en-US</NeutralLanguage>
<CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
<ClientVersion Condition=" '$(IsPreview)' != 'true' ">$(ClientOfficialVersion)</ClientVersion>
<ClientVersion Condition=" '$(IsPreview)' == 'true' ">$(ClientPreviewVersion)</ClientVersion>
<VersionSuffix Condition=" '$(IsNightly)' == 'true' ">nightly-$(CurrentDate)</VersionSuffix>
<VersionSuffix Condition=" '$(IsPreview)' == 'true' ">preview</VersionSuffix>
<Version Condition=" '$(VersionSuffix)' == '' ">$(ClientVersion)</Version>
<Version Condition=" '$(VersionSuffix)' != '' ">$(ClientVersion)-$(VersionSuffix)</Version>
<FileVersion>$(ClientVersion)</FileVersion>
<Authors>David Pine</Authors>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>Blazor.SourceGenerators</AssemblyName>
<Title>Blazor Source Generators</Title>
<Description>The source generator used to generate extension methods on the IJSInProcessRuntime type for WebAssembly JavaScript interop.</Description>
<RootNamespace>Blazor.SourceGenerators</RootNamespace>
<PackageId>Blazor.SourceGenerators</PackageId>
<PackageTags>dotnet;dotnetcore;csharp;analyzers;sourcegen;generators;roslyn;</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageProjectUrl>https://github.com/IEvangelist/blazorators</PackageProjectUrl>
<PublishRepositoryUrl Condition=" '$(ProjectRef)' != 'True' ">true</PublishRepositoryUrl>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PlatformTarget>AnyCPU</PlatformTarget>
<ShippingScope>External</ShippingScope>
<SigningType>Product</SigningType>
<DebugType>embedded</DebugType>
<IncludeSymbols>false</IncludeSymbols>
<IncludeSource>false</IncludeSource>
<NoWarn>NU5125;NU5039</NoWarn>
<Optimize Condition="'$(Configuration)'=='Release'">true</Optimize>
<RepositoryUrl>https://github.com/IEvangelist/blazorators</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryType>git</RepositoryType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IsPackable>true</IsPackable>
<PackageIcon>logo.png</PackageIcon>
<developmentDependency>true</developmentDependency>
</PropertyGroup>
<NeutralLanguage>en-US</NeutralLanguage>
<CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
<ClientVersion Condition=" '$(IsPreview)' != 'true' ">$(ClientOfficialVersion)</ClientVersion>
<ClientVersion Condition=" '$(IsPreview)' == 'true' ">$(ClientPreviewVersion)</ClientVersion>
<VersionSuffix Condition=" '$(IsNightly)' == 'true' ">nightly-$(CurrentDate)</VersionSuffix>
<VersionSuffix Condition=" '$(IsPreview)' == 'true' ">preview</VersionSuffix>
<Version Condition=" '$(VersionSuffix)' == '' ">$(ClientVersion)</Version>
<Version Condition=" '$(VersionSuffix)' != '' ">$(ClientVersion)-$(VersionSuffix)</Version>
<FileVersion>$(ClientVersion)</FileVersion>
<Authors>David Pine</Authors>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>Blazor.SourceGenerators</AssemblyName>
<Title>Blazor Source Generators</Title>
<Description>The source generator used to generate extension methods on the IJSInProcessRuntime type for WebAssembly JavaScript interop.</Description>
<RootNamespace>Blazor.SourceGenerators</RootNamespace>
<PackageId>Blazor.SourceGenerators</PackageId>
<PackageTags>dotnet;dotnetcore;csharp;analyzers;sourcegen;generators;roslyn;</PackageTags>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageProjectUrl>https://github.com/IEvangelist/blazorators</PackageProjectUrl>
<PublishRepositoryUrl Condition=" '$(ProjectRef)' != 'True' ">true</PublishRepositoryUrl>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PlatformTarget>AnyCPU</PlatformTarget>
<ShippingScope>External</ShippingScope>
<SigningType>Product</SigningType>
<DebugType>embedded</DebugType>
<IncludeSymbols>false</IncludeSymbols>
<IncludeSource>false</IncludeSource>
<NoWarn>NU5125;NU5039</NoWarn>
<Optimize Condition="'$(Configuration)'=='Release'">true</Optimize>
<RepositoryUrl>https://github.com/IEvangelist/blazorators</RepositoryUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryType>git</RepositoryType>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<PackageReadmeFile>README.md</PackageReadmeFile>
<IsPackable>true</IsPackable>
<PackageIcon>logo.png</PackageIcon>
<developmentDependency>true</developmentDependency>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PropertyGroup>
<NoWarn>1701;1702;NU5128</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<None Remove="Data\lib.dom.d.ts" />
</ItemGroup>
Expand Down

0 comments on commit 3c8fc17

Please sign in to comment.