mirror of
https://github.com/tonytins/cstdotnet.git
synced 2025-03-15 06:01:25 +00:00
1.0.1 merge conflict fixes
This commit is contained in:
parent
66ce788578
commit
6f07905fcf
4 changed files with 8 additions and 8 deletions
10
.github/workflows/pkgrelease.yml
vendored
10
.github/workflows/pkgrelease.yml
vendored
|
@ -18,8 +18,8 @@ jobs:
|
|||
run: dotnet restore
|
||||
- name: Package
|
||||
run: dotnet pack --no-restore -o .
|
||||
- name: Publish to Nuget
|
||||
env:
|
||||
NUGET_KEY: ${{ secrets.NUGET_KEY }}
|
||||
NUGET_API: https://api.nuget.org/v3/index.json
|
||||
run: dotnet nuget push CSTNet.*.nupkg -k $NUGET_KEY -s $NUGET_API
|
||||
# - name: Publish to Nuget
|
||||
# env:
|
||||
# NUGET_KEY: ${{ secrets.NUGET_KEY }}
|
||||
# NUGET_API: https://api.nuget.org/v3/index.json
|
||||
# run: dotnet nuget push CSTNet.*.nupkg -k $NUGET_KEY -s $NUGET_API
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\CSTNet\CSTNet.csproj" />
|
||||
<ProjectReference Include="..\CSTNet\QuickFennec.CST.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
|
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30717.126
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet", "CSTNet\CSTNet.csproj", "{82775826-A366-46F0-A5D2-5BE7658C75E4}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickFennec.CST", "CSTNet\QuickFennec.CST.csproj", "{82775826-A366-46F0-A5D2-5BE7658C75E4}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CCFCE2DB-C18F-4D88-B025-19ED62BD2A1D}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
|
@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
|||
README.md = README.md
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSTNet.Tests", "CSTNet.Tests\CSTNet.Tests.csproj", "{B6A98C64-1419-4B9A-99CA-72BB11D29472}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickFennec.CST.Tests", "CSTNet.Tests\QuickFennec.CST.Tests.csproj", "{B6A98C64-1419-4B9A-99CA-72BB11D29472}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
Loading…
Add table
Reference in a new issue