Add C# files to nuspec used in package stage (#40647)
Flor Chacón committed
May 26, 2026 at 16:23 UTC
846bd564aaaf34c01b9ca9cdc8c3ea85fbc7ce69
6 files changed
+7
-8
.pipelines/build-job.yml
+1
-1
@@ -124,7 +124,7 @@ jobs:
124
displayName: "CMake ${{ parameters.platform }}"
125
inputs:
126
workingDirectory: "."
127
- cmakeArgs: . --fresh -A ${{ parameters.platform }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION=10.0.26100.0 -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DSKIP_PACKAGE_SIGNING=${{ parameters.isRelease }} -DOFFICIAL_BUILD=${{ parameters.isRelease }} -DINCLUDE_PACKAGE_STAGE=${{ or(parameters.isRelease, parameters.isNightly) }} -DPIPELINE_BUILD_ID=$(Build.BuildId) -DVSO_ORG=${{ parameters.vsoOrg }} -DVSO_PROJECT=${{ parameters.vsoProject }} -DWSL_BUILD_WSL_SETTINGS=true -DWSL_BUILD_SDKCS=true $(packageInputDirArg)\${{ parameters.platform }}
127
+ cmakeArgs: . --fresh -A ${{ parameters.platform }} -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_VERSION=10.0.26100.0 -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DSKIP_PACKAGE_SIGNING=${{ parameters.isRelease }} -DOFFICIAL_BUILD=${{ parameters.isRelease }} -DINCLUDE_PACKAGE_STAGE=${{ or(parameters.isRelease, parameters.isNightly) }} -DPIPELINE_BUILD_ID=$(Build.BuildId) -DVSO_ORG=${{ parameters.vsoOrg }} -DVSO_PROJECT=${{ parameters.vsoProject }} -DWSL_BUILD_WSL_SETTINGS=true -DWSL_INCLUDE_SDK_CSHARP=true $(packageInputDirArg)\${{ parameters.platform }}
128
129
# Workaround for WSL Settings NuGet restore authentication issue
130
- script: _deps\nuget.exe restore -NonInteractive
.pipelines/package-stage.yml
+1
-1
@@ -98,7 +98,7 @@ stages:
98
displayName: "CMake configure (bundle-only)"
99
inputs:
100
workingDirectory: "."
101
- cmakeArgs: . -DBUNDLE_ONLY=TRUE -DCMAKE_BUILD_TYPE=Release -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION)
101
+ cmakeArgs: . -DBUNDLE_ONLY=TRUE -DCMAKE_BUILD_TYPE=Release -DPACKAGE_VERSION=$(version.WSL_PACKAGE_VERSION) -DWSL_NUGET_PACKAGE_VERSION=$(version.WSL_NUGET_PACKAGE_VERSION) -DWSL_INCLUDE_SDK_CSHARP=true
102
103
- script: cmake --build . --config Release --target bundle -- -m
104
displayName: Create msixbundle
CMakeLists.txt
+2
-2
@@ -175,8 +175,8 @@ if (NOT DEFINED WSL_BUILD_WSL_SETTINGS)
175
set(WSL_BUILD_WSL_SETTINGS false)
176
endif ()
177
178
-if (NOT DEFINED WSL_BUILD_SDKCS)
179
- set(WSL_BUILD_SDKCS false)
178
+if (NOT DEFINED WSL_INCLUDE_SDK_CSHARP)
179
+ set(WSL_INCLUDE_SDK_CSHARP false)
180
endif ()
181
182
find_commit_hash(COMMIT_HASH)
UserConfig.cmake.sample
+1
-1
@@ -37,7 +37,7 @@ endif()
37
# set(WSL_BUILD_WSL_SETTINGS true)
38
39
# # Uncomment to build the C# WSLC sdk
40
-# set(WSL_BUILD_SDKCS true)
40
+# set(WSL_INCLUDE_SDK_CSHARP true)
41
42
# # Uncomment to configure the WSLC SDK NuGet to only target the current platform
43
# set(WSL_NUGET_SINGLE_PLATFORM true)
nuget/CMakeLists.txt
+1
-2
@@ -22,8 +22,7 @@ function(read_nuspec_fragment var path)
22
endfunction()
23
24
# C# SDK wrapper DLL — AnyCPU, produced for any TARGET_PLATFORM.
25
-# Only include it when the C# SDK was actually built (WSL_BUILD_SDKCS).
26
-if(WSL_BUILD_SDKCS)
25
+if(WSL_INCLUDE_SDK_CSHARP)
26
read_nuspec_fragment(NUGET_SDKCS_FILE "${CMAKE_CURRENT_LIST_DIR}/fragments/wslc-cs.nuspec.in")
27
else()
28
set(NUGET_SDKCS_FILE "")
src/windows/WslcSDK/CMakeLists.txt
+1
-1
@@ -23,7 +23,7 @@ set_target_properties(wslcsdk
23
24
add_subdirectory(winrt)
25
26
-if (WSL_BUILD_SDKCS)
26
+if (WSL_INCLUDE_SDK_CSHARP)
27
add_subdirectory(csharp)
28
endif()
29