-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MAINTENANCE: drop net50, introduce net70
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
- Loading branch information
Showing
15 changed files
with
340 additions
and
1,464 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,8 @@ | |
| mono_crash.* | ||
|
|
||
| # Build results | ||
| Coverage/ | ||
| NuGet/ | ||
| [Dd]ebug/ | ||
| [Dd]ebugPublic/ | ||
| [Rr]elease/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <Import Project="Version.targets" /> | ||
|
|
||
| <!-- Common --> | ||
| <PropertyGroup> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <Platforms>AnyCPU</Platforms> | ||
| <RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot> | ||
| <!--<CodeAnalysisRuleSet>$(RepoRoot)\Configuration\CodeAnalysis.ruleset</CodeAnalysisRuleSet>--> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="$(Configuration.Contains('Debug'))"> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DebugType>full</DebugType> | ||
| <Optimize>false</Optimize> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="$(Configuration.Contains('Release'))"> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project> | ||
| <!-- This target is replaced by GitInfo when restored. Allows Versions.targets to rely on it before restore. --> | ||
| <Target Name="GitVersion" /> | ||
| <Target Name="GitInfo" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,27 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <Import Project="..\Configuration.targets" /> | ||
| <PropertyGroup> | ||
| <TargetFramework>net60</TargetFramework> | ||
|
|
||
| <TargetFramework>net70</TargetFramework> | ||
| <IsPackable>false</IsPackable> | ||
| <CollectCoverage>true</CollectCoverage> | ||
| <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute> | ||
| <CoverletOutputFormat>lcov</CoverletOutputFormat> | ||
| <CoverletOutput>$(RepoRoot)\Coverage\lcov.info</CoverletOutput> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="coverlet.msbuild" Version="3.0.3"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" /> | ||
| <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" /> | ||
| <PackageReference Include="MSTest.TestFramework" Version="2.2.3" /> | ||
| <PackageReference Include="coverlet.collector" Version="3.0.3"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <ProjectReference Include="..\LocaleNames\LocaleNames.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\LocaleNames\LocaleNames.csproj" /> | ||
| <PackageReference Include="coverlet.msbuild" Version="3.2.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" /> | ||
| <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" /> | ||
| <PackageReference Include="MSTest.TestFramework" Version="2.2.10" /> | ||
| <PackageReference Include="coverlet.collector" Version="3.2.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,40 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>netstandard2.0;net50;net60</TargetFrameworks> | ||
|
|
||
| <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | ||
| <GenerateAssemblyInfo>false</GenerateAssemblyInfo> | ||
| <GeneratePackageOnBuild>true</GeneratePackageOnBuild> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
|
|
||
| <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||
| <Authors>Jiri Slachta</Authors> | ||
| <PackageTags>locale, translations</PackageTags> | ||
| <PackageProjectUrl>https://github.com/jslachta/LocaleNames</PackageProjectUrl> | ||
|
|
||
| <RepositoryUrl>https://github.com/jslachta/LocaleNames</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
|
|
||
| <PackageLicenseExpression>Unlicense</PackageLicenseExpression> | ||
| <Description>The LocaleNames library provides language and country names translation to almost any language.</Description> | ||
| <Copyright>Copyright © Jiri Slachta</Copyright> | ||
| <PackageReleaseNotes>Check: https://github.com/jslachta/LocaleNames/releases </PackageReleaseNotes> | ||
| <GitTagRegex Condition="'$(GitTagRegex)' == ''">v*</GitTagRegex> | ||
| <GenerateNuspecDependsOn>ReadPackageVersionFromOutputAssembly;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn> | ||
|
|
||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build"> | ||
| <GetAssemblyIdentity AssemblyFiles="$(TargetPath)"> | ||
| <Output TaskParameter="Assemblies" ItemName="PackAssembly" /> | ||
| </GetAssemblyIdentity> | ||
| <PropertyGroup> | ||
| <PackageVersion>%(PackAssembly.Version)</PackageVersion> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'"> | ||
| <GetAssemblyIdentity AssemblyFiles="$(TargetPath)"> | ||
| <Output TaskParameter="Assemblies" ItemName="PackAssembly" /> | ||
| </GetAssemblyIdentity> | ||
| <PropertyGroup> | ||
| <PackageVersion>%(PackAssembly.Version)</PackageVersion> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="ReadPackageVersionFromOutputAssemblyMultipleTfms" Condition="'$(IsCrossTargetingBuild)' == 'true'"> | ||
| <PropertyGroup> | ||
| <FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework> | ||
| </PropertyGroup> | ||
| <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)"> | ||
| <Output TaskParameter="TargetOutputs" ItemName="PackAssembly" /> | ||
| </MSBuild> | ||
| <PropertyGroup> | ||
| <PackageVersion>%(PackAssembly.Version)</PackageVersion> | ||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build;ReadPackageVersionFromOutputAssemblySingleTfm;ReadPackageVersionFromOutputAssemblyMultipleTfms" /> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="GitInfo" Version="2.2.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> | ||
| <PackageReference Include="System.Text.Json" Version="[4.6.0,)" /> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="Resources.include" /> | ||
| <PropertyGroup> | ||
| <TargetFrameworks>netstandard2.0;net60;net70</TargetFrameworks> | ||
|
|
||
| <GeneratePackageOnBuild>false</GeneratePackageOnBuild> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
|
|
||
| <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> | ||
| <Authors>Jiri Slachta</Authors> | ||
| <PackageTags>locale, translations</PackageTags> | ||
| <PackageProjectUrl>https://github.com/jslachta/LocaleNames</PackageProjectUrl> | ||
|
|
||
| <RepositoryUrl>https://github.com/jslachta/LocaleNames</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
|
|
||
| <PackageLicenseExpression>Unlicense</PackageLicenseExpression> | ||
| <Description>The LocaleNames library provides language and country names translation to almost any language.</Description> | ||
| <Copyright>Copyright © Jiri Slachta</Copyright> | ||
| <PackageReleaseNotes>Check: https://github.com/jslachta/LocaleNames/releases </PackageReleaseNotes> | ||
|
|
||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="..\Configuration.targets" /> | ||
|
|
||
| <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2.0'))"> | ||
| <PackageReference Include="System.Text.Json" Version="[4.6.0,)" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Include="Resources\language.*.json.gz" /> | ||
| </ItemGroup> | ||
| </Project> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.