Fix multi-targeting file locks (OrchardCMS#14732)

gvkries · Nov 30, 2023 · 9267669 · 9267669
1 parent f840cc0
commit 9267669
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml
@@ -13,5 +13,5 @@ jobs:
     - uses: actions/checkout@v3
     - name: Build and test
       run: |
-        dotnet build -c Release -f net8.0
+        dotnet build -c Release
         dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -26,7 +26,7 @@ jobs:
         dotnet-version: '8.0.x'
     - name: Build
       run: |
-        dotnet build -c Release -f net8.0
+        dotnet build -c Release
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj

diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -30,7 +30,7 @@ jobs:
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV
     - name: Build
       run: |
-        dotnet build -c Release -f net8.0
+        dotnet build -c Release
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -41,7 +41,7 @@ jobs:
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV
     - name: Build
       run: |
-        dotnet build -c Release -f net8.0 -p:Version=${{ steps.get_version.outputs.VERSION }}
+        dotnet build -c Release -p:Version=${{ steps.get_version.outputs.VERSION }}
     - name: Unit Tests
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 

diff --git a/...e/OrchardCore.Application.Cms.Core.Targets/OrchardCore.Application.Cms.Core.Targets.props b/...e/OrchardCore.Application.Cms.Core.Targets/OrchardCore.Application.Cms.Core.Targets.props
@@ -4,10 +4,4 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\is-cache\**;wwwroot\ms-cache\**</DefaultItemExcludes>
   </PropertyGroup>
 
-  <ItemDefinitionGroup>
-    <_InnerBuildProjects>
-      <Properties>IsCrossTargetedBuild=$(IsCrossTargetingBuild)</Properties>
-    </_InnerBuildProjects>
-  </ItemDefinitionGroup>
-
 </Project>
diff --git a/...OrchardCore.Application.Cms.Core.Targets/OrchardCore.Application.Cms.Core.Targets.targets b/...OrchardCore.Application.Cms.Core.Targets/OrchardCore.Application.Cms.Core.Targets.targets
@@ -23,15 +23,14 @@
 
   <Target
     Name="CopyPackageTranslationFiles"
-    Condition="'$(IsCrossTargetingBuild)' != 'true' and ('$(IsCrossTargetedBuild)' != 'true' or '$(TargetFrameworks' == '' or '$(TargetFrameworks.IndexOf($(TargetFramework)))' == '0')"
     AfterTargets="Build">
-
     <Message Text="Copying translation files: $(MSBuildProjectName)" Importance="high" />
     <Copy
       SourceFiles="%(PackageTranslationFiles.FullPath)"
       DestinationFolder="Localization\%(RecursiveDir)"
       Condition="'@(PackageTranslationFiles)' != ''"
-      SkipUnchangedFiles="true" />
+      SkipUnchangedFiles="true"
+      OverwriteReadOnlyFiles="false" />
   </Target>
 
   <Target Name="PublishTranslationFiles" BeforeTargets="GetCopyToPublishDirectoryItems">