Microsoft.NETFramework.ReferenceAssemblies 2

na1307 · May 15, 2024 · 9c1df4d · 9c1df4d
1 parent fb26635
commit 9c1df4d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/SonarCloud.yml b/.github/workflows/SonarCloud.yml
@@ -40,7 +40,7 @@ jobs:
         shell: powershell
         run: |
           dotnet sonarscanner begin /k:"na1307_Bluehill.Hangul" /o:"na1307" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
-          dotnet restore --locked-mode
-          dotnet build --no-incremental
+          dotnet restore
+          dotnet build --no-restore --no-incremental
           dotnet coverage collect 'dotnet test --no-build --verbosity normal' -f xml  -o 'coverage.xml'
           dotnet sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/Bluehill.Hangul.Pages.Tests/packages.lock.json b/Bluehill.Hangul.Pages.Tests/packages.lock.json
@@ -415,7 +415,7 @@
       "bluehill.hangul.pages": {
         "type": "Project",
         "dependencies": {
-          "Bluehill.Hangul": "[2.1.0-gh-actions-test.0, )",
+          "Bluehill.Hangul": "[2.1.0-beta.1, )",
           "HighlightBlazor": "[0.1.10, )",
           "Microsoft.AspNetCore.Components.WebAssembly": "[8.0.4, )",
           "Microsoft.AspNetCore.Components.WebAssembly.DevServer": "[8.0.4, )",

diff --git a/Bluehill.Hangul/Bluehill.Hangul.csproj b/Bluehill.Hangul/Bluehill.Hangul.csproj
@@ -19,6 +19,12 @@
     <Using Remove="System.Net.Http" />
     <Using Remove="System.Threading.Tasks" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Condition="'$(TargetFramework)' == 'net20' or '$(TargetFramework)' == 'net35'">
+     <PrivateAssets>all</PrivateAssets>
+     <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.CLSCompliantAttribute">
       <_Parameter1>true</_Parameter1>
@@ -33,9 +39,4 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,5 +22,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <RestoreLockedMode>true</RestoreLockedMode>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,9 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageVersion>
+    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="HighlightBlazor" Version="0.1.10" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" />