Добавил публикацию README.md и LICENSE.txt в nuget.org. Поднял весрию…

… .net в тестах до 6. Поправил файлы github actions. Поднял версию пакета до 1.1.5.
Byndyusoft · Sep 6, 2023 · 1013868 · 1013868
1 parent ce62d50
commit 1013868
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -21,7 +21,7 @@ jobs:
       - name: install dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: 6.0.x
 
       - name: install packages
         run: dotnet restore

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,7 +21,7 @@ jobs:
       - name: install dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: 6.0.x
 
       - name: install packages
         run: dotnet restore

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: install dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 6.0.x
 
       - name: install packages
         run: dotnet restore

diff --git a/.gitignore b/.gitignore
@@ -140,4 +140,6 @@ ModelManifest.xml
 
 **/.vs/config/applicationhost.config
 src/.vs/**
-.vs/**
+.vs/**
+
+.idea
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.1.4</Version>
+    <Version>1.1.5</Version>
     <RootNamespace>Byndyusoft.ModelResult</RootNamespace>
     <Authors>Byndyusoft</Authors>
     <PackageTags>Byndyusoft;ModelResult</PackageTags>

diff --git a/README.md b/README.md
@@ -88,22 +88,12 @@ A detailed overview on how to contribute can be found in the [contributing guide
 Make sure you have installed all of the following prerequisites on your development machine:
 
 - Git - [Download & Install Git](https://git-scm.com/downloads). OSX and Linux machines typically have this already installed.
-- .NET Core (version 3.1 or higher) - [Download & Install .NET Core](https://dotnet.microsoft.com/download/dotnet-core/3.1).
-
-## General folders layout
-
-### src
-- source code
-
-### tests
-
-- unit-tests
-
+- .NET Core (version 6.0 or higher) - [Download & Install .NET Core](https://dotnet.microsoft.com/en-us/download/dotnet/6.0).
 
 ## Package development lifecycle
 
 - Implement package logic in `src`
-- Add or addapt unit-tests (prefer before and simultaneously with coding) in `tests`
+- Add or adapt unit-tests in `tests`
 - Add or change the documentation as needed
 - Open pull request in the correct branch. Target the project's `master` branch
 

diff --git a/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj b/src/ModelResult.AspNetCore/Byndyusoft.ModelResult.AspNetCore.csproj
@@ -5,6 +5,7 @@
     <nullable>enable</nullable>
     <PackageId>Byndyusoft.ModelResult.AspNetCore</PackageId>
     <RootNamespace>Byndyusoft.ModelResult.AspNetCore</RootNamespace>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,4 +16,9 @@
     <ProjectReference Include="..\ModelResult\Byndyusoft.ModelResult.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
 </Project>
diff --git a/src/ModelResult/Byndyusoft.ModelResult.csproj b/src/ModelResult/Byndyusoft.ModelResult.csproj
@@ -4,6 +4,12 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <PackageId>Byndyusoft.ModelResult</PackageId>
     <RootNamespace>Byndyusoft.ModelResult</RootNamespace>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
 </Project>
diff --git a/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj b/tests/ModelResult.UnitTests/Byndyusoft.ModelResult.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <nullable>enable</nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,4 +140,6 @@ ModelManifest.xml @@
     **/.vs/config/applicationhost.config
     src/.vs/**
-    .vs/**
+    .vs/**
+    .idea