Revert "调度到官方服务器且干掉使用私有的库"

This reverts commit d7b7aa2.
dotnet-campus · Dec 6, 2023 · 67b54af · 67b54af
1 parent d7b7aa2
commit 67b54af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -5,8 +5,7 @@ on: [push]
 jobs:
   BuildDebug:
 
-    # runs-on: [self-hosted, VSPreview]
-    runs-on: windows-latest
+    runs-on: [self-hosted, VSPreview]
 
     steps:
     - uses: actions/checkout@v1
@@ -24,18 +23,18 @@ jobs:
         name: WPF_Debug
         path: ./artifacts/packages/Debug/NonShipping
 
-  # BuildRelease:
+  BuildRelease:
 
-  #   runs-on: [self-hosted, VSPreview]
+    runs-on: [self-hosted, VSPreview]
 
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   - name: Build
-  #     run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
-  #   - name: Build CustomWPF
-  #     run: dotnet build CustomWpf -c Release
-  #   - name: Push
-  #     uses: actions/upload-artifact@v1
-  #     with:
-  #       name: WPF_Release
-  #       path: ./artifacts/packages/Release/NonShipping
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build
+      run: .\build.cmd -pack -ci -configuration Release -prepareMachine /p:Platform=x86
+    - name: Build CustomWPF
+      run: dotnet build CustomWpf -c Release
+    - name: Push
+      uses: actions/upload-artifact@v1
+      with:
+        name: WPF_Release
+        path: ./artifacts/packages/Release/NonShipping
diff --git a/eng/WpfArcadeSdk/tools/Wpf.Cpp.props b/eng/WpfArcadeSdk/tools/Wpf.Cpp.props
@@ -107,10 +107,10 @@
     <ManagedCxxSuppressions>$(ManagedCxxSuppressions);4995</ManagedCxxSuppressions>
   </PropertyGroup>
 
-<!--   <PropertyGroup>
+  <PropertyGroup>
     <UsePrivateCppTools Condition="'$(UsePrivateCppTools)' == ''">false</UsePrivateCppTools>
   </PropertyGroup>
-  <Import Project="Wpf.Cpp.PrivateTools.props" Condition="Exists('Wpf.Cpp.PrivateTools.props') And '$(UsePrivateCppTools)'=='true'"/> -->
+  <Import Project="Wpf.Cpp.PrivateTools.props" Condition="Exists('Wpf.Cpp.PrivateTools.props') And '$(UsePrivateCppTools)'=='true'"/>
 
   <!-- Set up standard libraries for Native C++ projects -->
   <PropertyGroup>