catch up the repository template updates

smdn · May 15, 2023 · 8616c44 · 8616c44
1 parent 838dc20
commit 8616c44
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 16 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v3.5.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/generate-release-target.yml b/.github/workflows/generate-release-target.yml
@@ -61,7 +61,7 @@ jobs:
         exit 1
 
   run-generate-release-target:
-    uses: smdn/Smdn.Fundamentals/.github/workflows/generate-release-target.yml@workflows/release-target-v1.6.0
+    uses: smdn/Smdn.Fundamentals/.github/workflows/generate-release-target.yml@workflows/release-target-v1.7.0
     needs: determine-release-target
     if: startsWith(needs.determine-release-target.outputs.tag_name, 'new-release/')
     with:

diff --git a/.github/workflows/publish-release-target.yml b/.github/workflows/publish-release-target.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   run-publish-release-target:
-    uses: smdn/Smdn.Fundamentals/.github/workflows/publish-release-target.yml@workflows/release-target-v1.6.0
+    uses: smdn/Smdn.Fundamentals/.github/workflows/publish-release-target.yml@workflows/release-target-v1.7.0
     if: |
       (github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/')) &&
       (contains(github.event.pull_request.labels.*.name, 'release-target'))

diff --git a/.github/workflows/test-packages.yml b/.github/workflows/test-packages.yml
@@ -47,13 +47,14 @@ jobs:
         fi
 
   run-test:
-    uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.1.5
+    uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.2.0
     needs: prerequisites
     with:
       project:              ${{ github.event.inputs.project }}
       os:                   ${{ github.event.inputs.os }}
       extra_options_common: '/p:TestReleasedPackage=true'
       verbose:              ${{ fromJSON(needs.prerequisites.outputs.verbose) }}
+      path_proj_install_project_assets: "eng/InstallProjectAssets.proj"
       dotnet_sdk_version:   '6.0.200'
       timeout_minutes_test_job:   10
       timeout_hang:               "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,12 +61,13 @@ jobs:
         fi
 
   run-test:
-    uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.1.5
+    uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.2.0
     needs: prerequisites
     with:
       project:            ${{ github.event.inputs.project }}
       os:                 ${{ needs.prerequisites.outputs.os }}
       verbose:            ${{ fromJSON(needs.prerequisites.outputs.verbose) }}
+      path_proj_install_project_assets: "eng/InstallProjectAssets.proj"
       dotnet_sdk_version: '6.0.200'
       timeout_minutes_test_job:   10
       timeout_hang:               "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"

diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,5 @@ mono_crash.mem.*.blob
 mono_crash.*.json
 
 # automatically generated files from Smdn.MSBuild.ProjectAssets.*
-.editorconfig
-src/.editorconfig
+/.editorconfig
+/src/.editorconfig
diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ Contributions are appreciated!
 
 If there's a feature you would like to add or a bug you would like to fix, please read [Contribution guidelines](./CONTRIBUTING.md) and create an Issue or Pull Request.
 
-IssueやPull Requestを送る際は、[Contribution guidelines](./CONTRIBUTING.md)をご覧頂ください。　可能なら英語が望ましいですが、日本語で構いません。　
+IssueやPull Requestを送る際は、[Contribution guidelines](./CONTRIBUTING.md)をご覧頂ください。　可能なら英語が望ましいですが、日本語で構いません。
 
 # Notice
 This project is licensed under the terms of the [MIT License](./LICENSE.txt).

diff --git a/eng/BuildAllProjects.ps1 b/eng/BuildAllProjects.ps1
@@ -7,15 +7,19 @@ $RepositoryRootDirectory = [System.IO.Path]::GetFullPath(
 )
 
 # download Smdn.MSBuild.ProjectAssets.* first
-dotnet restore ${RepositoryRootDirectory}eng\InstallProjectAssets.proj
+dotnet restore $([System.IO.Path]::Join($RepositoryRootDirectory, 'eng', 'InstallProjectAssets.proj'))
 
 # create a solution for the build target projects
 Set-Location $RepositoryRootDirectory
 
 dotnet new sln
 
 # add build target projects to the solution
-dotnet sln add ${RepositoryRootDirectory}src/Smdn.*/*.csproj
+$ProjectFiles = Get-ChildItem -Path $([System.IO.Path]::Join($RepositoryRootDirectory, 'src', 'Smdn.*', '*')) -Filter '*.csproj'
+
+foreach ($ProjectFile in $ProjectFiles) {
+  dotnet sln add $ProjectFile
+}
 
 # restore dependencies
 dotnet restore

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -13,7 +13,7 @@ SPDX-License-Identifier: MIT
 
   <PropertyGroup Label="API list generator configurations">
     <APIListOutputBaseDirectory>$(MSBuildThisFileDirectory)..\doc\api-list\</APIListOutputBaseDirectory>
-    <APIListPackageVersion>1.2.1</APIListPackageVersion>
+    <APIListPackageVersion>1.2.2</APIListPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="package properties">

diff --git a/src/ProjectAssets.props b/src/ProjectAssets.props
@@ -4,8 +4,8 @@ SPDX-License-Identifier: MIT
 -->
 <Project>
   <PropertyGroup>
-    <SmdnProjectAssets_Common_PackageVersion Condition=" '$(SmdnProjectAssets_Common_PackageVersion)' == '' ">1.3.5</SmdnProjectAssets_Common_PackageVersion>
-    <SmdnProjectAssets_Library_PackageVersion Condition=" '$(SmdnProjectAssets_Library_PackageVersion)' == '' ">1.5.0</SmdnProjectAssets_Library_PackageVersion>
+    <SmdnProjectAssets_Common_PackageVersion Condition=" '$(SmdnProjectAssets_Common_PackageVersion)' == '' ">1.3.6</SmdnProjectAssets_Common_PackageVersion>
+    <SmdnProjectAssets_Library_PackageVersion Condition=" '$(SmdnProjectAssets_Library_PackageVersion)' == '' ">1.6.0</SmdnProjectAssets_Library_PackageVersion>
   </PropertyGroup>
 
   <!--

diff --git a/src/Smdn.Net.AddressResolution/Smdn.Net.AddressResolution.csproj b/src/Smdn.Net.AddressResolution/Smdn.Net.AddressResolution.csproj
@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
     <VersionPrefix>1.0.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <PackageValidationBaselineVersion>1.0.0</PackageValidationBaselineVersion>
+    <RootNamespace/> <!-- empty the root namespace so that the namespace is determined only by the directory name, for code style rule IDE0030 -->
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>CA1848;$(NoWarn)</NoWarn> <!-- use the LoggerMessage delegates instead -->

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -25,9 +25,9 @@ SPDX-License-Identifier: MIT
   />
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
   </ItemGroup>
 
   <ItemGroup>