diff --git a/.github/workflows/alpha-ci.yml b/.github/workflows/alpha-ci.yml index 10b9e5f..674e3d9 100644 --- a/.github/workflows/alpha-ci.yml +++ b/.github/workflows/alpha-ci.yml @@ -20,7 +20,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 + dotnet-version: '8.0.x' - name: Restore dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3a2631..e4974b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - dotnet: [ '3.1.x' ] + dotnet: [ '8.0.x' ] agent: ['windows-2019','ubuntu-latest','macos-latest'] name: Build Start with ${{matrix.agent}} @@ -56,4 +56,4 @@ jobs: run: dotnet build -c ${{ env.BUILD_CONFIG }} --no-restore $PROJECT_PATH - name: dotnet pack [$PROJECT_NAME] - run: dotnet pack $PROJECT_PATH -c ${{ env.BUILD_CONFIG }} --include-symbols -p:SymbolPackageFormat=snupkg -o ./artifacts \ No newline at end of file + run: dotnet pack $PROJECT_PATH -c ${{ env.BUILD_CONFIG }} --include-symbols -p:SymbolPackageFormat=snupkg -o ./artifacts diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f1fb14d..72f2ace 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - dotnet: [ '3.1.x' ] + dotnet: [ '8.0.x' ] agent: ['windows-2019','ubuntu-latest','macos-latest'] name: Build Start with ${{matrix.agent}} diff --git a/.github/workflows/nuget-preview.yml b/.github/workflows/nuget-preview.yml index 019b90e..22fb97c 100644 --- a/.github/workflows/nuget-preview.yml +++ b/.github/workflows/nuget-preview.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - dotnet: [ '3.1.404'] + dotnet: [ '8.0.x'] steps: - name: Set env. aux vars diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml index 13e3950..984ecea 100644 --- a/.github/workflows/nuget-publish.yml +++ b/.github/workflows/nuget-publish.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - dotnet: [ '3.1.404'] + dotnet: [ '8.0.x'] steps: - name: Set env. aux vars diff --git a/Directory.Build.props b/Directory.Build.props index 871b877..99825e9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,21 +2,35 @@ <Import Project="dependencies.props" /> <PropertyGroup> <VersionPrefix>1</VersionPrefix> - <Version>$(VersionPrefix).1.0.0</Version> + <Version>$(VersionPrefix).2.4</Version> <FileVersion>$(Version)</FileVersion> <Company>René Pacios</Company> <Copyright>Copyright © $(Company) - $([System.DateTime]::Now.Year)</Copyright> - - </PropertyGroup> <!--<PropertyGroup> <LangVersion>8.0</LangVersion> </PropertyGroup>--> - <PropertyGroup> <TreatWarningsAsErrors>False</TreatWarningsAsErrors> <WarningsAsErrors></WarningsAsErrors> </PropertyGroup> - + <PropertyGroup> + <PublishRepositoryUrl>true</PublishRepositoryUrl> + <EmbedUntrackedSources>true</EmbedUntrackedSources> + <!--<DebugType>embedded</DebugType>--> + <IncludeSymbols>true</IncludeSymbols> + <SymbolPackageFormat>snupkg</SymbolPackageFormat> + </PropertyGroup> + <PropertyGroup > + <!-- Condition="'$(GITHUB_ACTIONS)' == 'true'" --> + <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> + </PropertyGroup> + <PropertyGroup> + <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath> + </PropertyGroup> + <ItemGroup> + <!-- https://github.com/dotnet/sourcelink/issues/572 --> + <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/> + </ItemGroup> </Project> \ No newline at end of file diff --git a/Rene.Utils.Core.sln b/Rene.Utils.Core.sln index de20181..1fd5b3b 100644 --- a/Rene.Utils.Core.sln +++ b/Rene.Utils.Core.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 +# Visual Studio Version 17 +VisualStudioVersion = 17.9.34607.119 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rene.Utils.Core", "src\Rene.Utils.Core\Rene.Utils.Core.csproj", "{C79F6350-F304-4135-9420-4D67A6B26099}" EndProject @@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets .config\dotnet-tools.json = .config\dotnet-tools.json + LICENSE = LICENSE README.md = README.md EndProjectSection EndProject diff --git a/build/_ b/build/_ deleted file mode 100644 index 31354ec..0000000 --- a/build/_ +++ /dev/null @@ -1 +0,0 @@ -_ diff --git a/dependencies.props b/dependencies.props index 2a0186e..95cc786 100644 --- a/dependencies.props +++ b/dependencies.props @@ -2,13 +2,14 @@ <PropertyGroup Label="SDK Versions"> <NetStandardTargetVersion>netstandard2.1</NetStandardTargetVersion> <NetCoreTargetVersion>netcoreapp3.1</NetCoreTargetVersion> - <!--<LangVersion>8.0</LangVersion>--> + <LangVersion>8.0</LangVersion> </PropertyGroup> <PropertyGroup Label="Package Versions"> <FluentAssertions>5.10.3</FluentAssertions> <Xunit>2.4.1</Xunit> + <SourceLinkGithub>8.0.0</SourceLinkGithub> </PropertyGroup> </Project> \ No newline at end of file diff --git a/src/Rene.Utils.Core/Rene.Utils.Core.csproj b/src/Rene.Utils.Core/Rene.Utils.Core.csproj index c6f36ec..6e7ae0c 100644 --- a/src/Rene.Utils.Core/Rene.Utils.Core.csproj +++ b/src/Rene.Utils.Core/Rene.Utils.Core.csproj @@ -1,48 +1,68 @@ <Project Sdk="Microsoft.NET.Sdk"> - <PropertyGroup> - <TargetFramework>netstandard2.0</TargetFramework> - <Authors>René Pacios</Authors> - <Company>www.WebRene.es</Company> - <Product>DotNet Rene.Utils</Product> - <Description>Rene.Utils is a set of useful utilities and extensions of recurrent usage</Description> - <Copyright>Copyright 2018</Copyright> - <LicenseUrl>https://github.com/renepacios/DotNet.Rene.Utils/blob/main/LICENSE</LicenseUrl> - <PackageProjectUrl>https://github.com/renepacios/DotNet.Rene.Utils</PackageProjectUrl> - <RepositoryUrl>https://github.com/renepacios/DotNet.Rene.Utils</RepositoryUrl> - <PackageTags>Utils .NET Standard DotNetCore</PackageTags> - <NeutralLanguage>en</NeutralLanguage> - <!--<AssemblyVersion>$(FileVersion)</AssemblyVersion> + <PropertyGroup> + <TargetFramework>netstandard2.0</TargetFramework> + <Authors>René Pacios</Authors> + <Company>www.WebRene.es</Company> + <Product>DotNet Rene.Utils</Product> + <Description>Rene.Utils is a set of useful utilities and extensions of recurrent usage</Description> + <Copyright>Copyright 2018</Copyright> + <LicenseUrl>https://github.com/renepacios/DotNet.Rene.Utils/blob/main/LICENSE</LicenseUrl> + <PackageProjectUrl>https://github.com/renepacios/DotNet.Rene.Utils</PackageProjectUrl> + <RepositoryUrl>https://github.com/renepacios/DotNet.Rene.Utils</RepositoryUrl> + <PackageTags>Utils .NET Standard DotNetCore</PackageTags> + <NeutralLanguage>en</NeutralLanguage> + <!--<AssemblyVersion>$(FileVersion)</AssemblyVersion> <FileVersion>$(FileVersion)</FileVersion>--> - <GeneratePackageOnBuild>true</GeneratePackageOnBuild> - <VersionPrefix>$(VersionPrefix)</VersionPrefix> - <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> - <Version>$(Version)</Version> - <FileVersion>$(FileVersion)</FileVersion> - <LangVersion>8</LangVersion> - </PropertyGroup> + <GeneratePackageOnBuild>true</GeneratePackageOnBuild> + <VersionPrefix>$(VersionPrefix)</VersionPrefix> + <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> + <Version>$(Version)</Version> + <FileVersion>$(FileVersion)</FileVersion> + <LangVersion>$(LangVersion)</LangVersion> + <PackageLicenseFile>LICENSE</PackageLicenseFile> + <PackageReadmeFile>README.md</PackageReadmeFile> + </PropertyGroup> - <ItemGroup> - <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7"> - <PrivateAssets>all</PrivateAssets> - <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> - </PackageReference> - </ItemGroup> + <ItemGroup> + <None Include="..\..\LICENSE"> + <Pack>True</Pack> + <PackagePath>\</PackagePath> + </None> + <None Include="..\..\README.md"> + <Pack>True</Pack> + <PackagePath>\</PackagePath> + </None> + </ItemGroup> + + <ItemGroup> + <SourceRoot Include="$(MSBuildThisFileDirectory)/" /> + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(SourceLinkGithub)"> + <PrivateAssets>all</PrivateAssets> + <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> + </PackageReference> + </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7"> + <PrivateAssets>all</PrivateAssets> + <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> + </PackageReference> + </ItemGroup> - <ItemGroup> - <Compile Update="Resources\ExceptionMessages.Designer.cs"> - <DesignTime>True</DesignTime> - <AutoGen>True</AutoGen> - <DependentUpon>ExceptionMessages.resx</DependentUpon> - </Compile> - </ItemGroup> + <ItemGroup> + <Compile Update="Resources\ExceptionMessages.Designer.cs"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>ExceptionMessages.resx</DependentUpon> + </Compile> + </ItemGroup> - <ItemGroup> - <EmbeddedResource Update="Resources\ExceptionMessages.resx"> - <Generator>PublicResXFileCodeGenerator</Generator> - <LastGenOutput>ExceptionMessages.Designer.cs</LastGenOutput> - </EmbeddedResource> - </ItemGroup> + <ItemGroup> + <EmbeddedResource Update="Resources\ExceptionMessages.resx"> + <Generator>PublicResXFileCodeGenerator</Generator> + <LastGenOutput>ExceptionMessages.Designer.cs</LastGenOutput> + </EmbeddedResource> + </ItemGroup> </Project> diff --git a/tests/Rene.Utils.Core.UnitTest/Rene.Utils.Core.UnitTest.csproj b/tests/Rene.Utils.Core.UnitTest/Rene.Utils.Core.UnitTest.csproj index b8e6f28..70b3816 100644 --- a/tests/Rene.Utils.Core.UnitTest/Rene.Utils.Core.UnitTest.csproj +++ b/tests/Rene.Utils.Core.UnitTest/Rene.Utils.Core.UnitTest.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>$(NetCoreTargetVersion)</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <Version>$(Version)</Version> <FileVersion>$(FileVersion)</FileVersion> <IsPackable>false</IsPackable>