Merge pull request #1164 from Basaingeal/release/v1.5.0

Release/v1.5.0
Basaingeal · Dec 3, 2022 · 250127a · 250127a
2 parents 3ee5864 + 72d3359
commit 250127a
Show file tree

Hide file tree

Showing 5 changed files with 2,399 additions and 2,493 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,28 +1,10 @@
-# v1.4.0
+# v1.5.0
 
-## Dependencies
+## .NET 7 support
 
-### Multi-targetting enabled
+.NET 7 is enabled as a framework target.
 
-Blazor dependencies are now dependant on which version of .NET is being used in the application.
+## Remove .NET 5 support
 
-#### .NETCoreApp 3.1
-
-- `Microsoft.AspNetCore.Components` (>= `3.1.0` && < `5.0.0`)
-- `Microsoft.AspNetCore.Components.Web` (>= `3.1.0` && < `5.0.0`)
-
-#### .NETStandard 2.0
-
-- `Microsoft.AspNetCore.Components` (>= `3.1.0` && < `5.0.0`)
-- `Microsoft.AspNetCore.Components.Web` (>= `3.1.0` && < `5.0.0`)
-
-#### net5.0
-
-- `Microsoft.AspNetCore.Components` (>= `5.0.0` && < `6.0.0`)
-- `Microsoft.AspNetCore.Components.Web` (>= `5.0.0` && < `6.0.0`)
-
-## Preview .NET 6 support
-
-.NET 6 is enabled as a framework target.
-Currently this will use preview versions of the Blazor component libraries.
-These will be upgraded to non-preview when .NET 6 becomes generally available.
+.NET 5 is no longer explicitly supported as it is EOL.
+The package should still work in .NET 5 apps though as a `netstandard2.0` package.
diff --git a/CurrieTechnologies.Razor.Clipboard.csproj b/CurrieTechnologies.Razor.Clipboard.csproj
@@ -1,69 +1,69 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.0;</TargetFrameworks>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <Authors>Michael J. Currie</Authors>
-    <Company>Currie Technologies</Company>
-    <Product>Razor.Clipboard</Product>
-    <Description>
-      A Razor class library for interacting with the browser Clipboard API.
-      Use in Blazor Server Apps or Blazor WebAssembly Apps.
-    </Description>
-    <Copyright>Michael J. Currie</Copyright>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/Basaingeal/Razor.Clipboard</PackageProjectUrl>
-    <PackageIcon>logo_v2_128.png</PackageIcon>
-    <RepositoryUrl>https://github.com/Basaingeal/Razor.Clipboard</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>Blazor Clipboard JSInterop Razor</PackageTags>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>
-      enable multi-targetting
-    </PackageReleaseNotes>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net7.0;net6.0;netcoreapp3.1;netstandard2.0;</TargetFrameworks>
+		<RazorLangVersion>3.0</RazorLangVersion>
+		<Authors>Michael J. Currie</Authors>
+		<Company>Currie Technologies</Company>
+		<Product>Razor.Clipboard</Product>
+		<Description>
+			A Razor class library for interacting with the browser Clipboard API.
+			Use in Blazor Server Apps or Blazor WebAssembly Apps.
+		</Description>
+		<Copyright>Michael J. Currie</Copyright>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageProjectUrl>https://github.com/Basaingeal/Razor.Clipboard</PackageProjectUrl>
+		<PackageIcon>logo_v2_128.png</PackageIcon>
+		<RepositoryUrl>https://github.com/Basaingeal/Razor.Clipboard</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageTags>Blazor Clipboard JSInterop Razor</PackageTags>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageReleaseNotes>
+			add .NET 7 support
+		</PackageReleaseNotes>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="package.json" />
-    <Content Remove="tsconfig.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Remove="package.json" />
+		<Content Remove="tsconfig.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="wwwroot\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="package.json" />
-    <None Include="tsconfig.json" />
-    <None Include="logo_v2_128.png" Pack="true" PackagePath="\"/>
-    <None Include="README.md" Pack="true" PackagePath="\"/>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="package.json" />
+		<None Include="tsconfig.json" />
+		<None Include="logo_v2_128.png" Pack="true" PackagePath="\" />
+		<None Include="README.md" Pack="true" PackagePath="\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="[7.0.0-preview1.*, 8.0.0)">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.0, 5.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.0, 5.0.0)" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.0" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.0, 5.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.0, 5.0.0)" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.0, 5.0.0)" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.0, 5.0.0)" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="[5.0.0, 6.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[5.0.0, 6.0.0)" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="[6.0.0, 7.0.0)" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[6.0.0, 7.0.0)" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="[6.0.0-rc.2.21480.10, 7.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[6.0.0-rc.2.21480.10, 7.0.0)" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="[7.0.0, 8.0.0)" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[7.0.0, 8.0.0)" />
+	</ItemGroup>
 
-</Project>
+</Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -69,7 +69,7 @@ stages:
             displayName: "Use .NET Core sdk"
             inputs:
               packageType: "sdk"
-              version: "6.0.x"
+              version: "7.0.x"
               includePreviewVersions: true
 
           - task: DotNetCoreCLI@2