Browse Source

Merge branch 'eesast:dev' into new

dev
shangfengh GitHub 1 year ago
parent
commit
8717f856b0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
  1. +4
    -4
      .github/workflows/upload_COS.yml
  2. +1
    -1
      installer/Installer/Installer.csproj
  3. +1
    -1
      installer/InstallerUpdater/InstallerUpdater.csproj

+ 4
- 4
.github/workflows/upload_COS.yml View File

@@ -21,7 +21,7 @@ jobs:
dotnet-version: 6.0.402 dotnet-version: 6.0.402
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with: with:
python-version: '3.9.2' python-version: '3.9.2'
architecture: 'x64' architecture: 'x64'
@@ -88,7 +88,7 @@ jobs:
cp -r ./CAPI/shell/* ./THUAI6/linux/ cp -r ./CAPI/shell/* ./THUAI6/linux/
cp -r ./CAPI/shell/* ./THUAI6/osx/ cp -r ./CAPI/shell/* ./THUAI6/osx/


- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with: with:
name: my-artifact name: my-artifact
path: ./THUAI6 path: ./THUAI6
@@ -105,14 +105,14 @@ jobs:
dotnet-version: 6.0.x dotnet-version: 6.0.x
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with: with:
python-version: '3.9' python-version: '3.9'


- name: Pip Install paramiko - name: Pip Install paramiko
run: pip install paramiko run: pip install paramiko


- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with: with:
name: my-artifact name: my-artifact
path: ./THUAI6 path: ./THUAI6


+ 1
- 1
installer/Installer/Installer.csproj View File

@@ -25,7 +25,7 @@
<PackageReference Include="ICSharpCode.SharpZipLib.dll" Version="0.85.4.369" /> <PackageReference Include="ICSharpCode.SharpZipLib.dll" Version="0.85.4.369" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.36" />
</ItemGroup> </ItemGroup>


</Project> </Project>

+ 1
- 1
installer/InstallerUpdater/InstallerUpdater.csproj View File

@@ -17,7 +17,7 @@


<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.35">
<PackageReference Include="Tencent.QCloud.Cos.Sdk" Version="5.4.36">
<TreatAsUsed>true</TreatAsUsed> <TreatAsUsed>true</TreatAsUsed>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>


Loading…
Cancel
Save