Fangjun Kuang
Committed by GitHub

Fix building .Net packages (#247)

@@ -109,7 +109,6 @@ jobs: @@ -109,7 +109,6 @@ jobs:
109 run: | 109 run: |
110 cd windows 110 cd windows
111 unzip ./*.whl 111 unzip ./*.whl
112 - cp -v ./*.dll sherpa_onnx/lib/  
113 tree . 112 tree .
114 113
115 - name: Setup .NET Core 3.1 114 - name: Setup .NET Core 3.1
@@ -82,9 +82,20 @@ def process_windows(s): @@ -82,9 +82,20 @@ def process_windows(s):
82 "sherpa-onnx-c-api.dll", 82 "sherpa-onnx-c-api.dll",
83 "sherpa-onnx-core.dll", 83 "sherpa-onnx-core.dll",
84 ] 84 ]
85 - prefix = f"{SHERPA_ONNX_DIR}/windows/sherpa_onnx/lib/"  
86 - libs = [prefix + lib for lib in libs]  
87 - libs = "\n ;".join(libs) 85 + prefix1 = f"{SHERPA_ONNX_DIR}/windows/sherpa_onnx/lib/"
  86 + prefix2 = f"{SHERPA_ONNX_DIR}/windows/sherpa_onnx/"
  87 + prefix3 = f"{SHERPA_ONNX_DIR}/windows/"
  88 +
  89 + lib_list = []
  90 + for lib in libs:
  91 + for prefix in [prefix1, prefix2, prefix3]:
  92 + f = Path(prefix) / lib
  93 + if f.is_file():
  94 + lib_list.append(str(f))
  95 + break
  96 +
  97 + print("lib_list", lib_list)
  98 + libs = "\n ;".join(lib_list)
88 99
89 d = get_dict() 100 d = get_dict()
90 d["dotnet_rid"] = "win-x64" 101 d["dotnet_rid"] = "win-x64"