Merge pull request #5514 from sbwalker/dev
add project reference in AppHost to Server so that dependencies will be automatically copied
This commit is contained in:
@ -44,4 +44,8 @@
|
|||||||
<PackageReference Include="Oqtane.Server" Version="6.1.5" />
|
<PackageReference Include="Oqtane.Server" Version="6.1.5" />
|
||||||
<PackageReference Include="Oqtane.Shared" Version="6.1.5" />
|
<PackageReference Include="Oqtane.Shared" Version="6.1.5" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
|
||||||
<metadata>
|
|
||||||
<id>$projectname$</id>
|
|
||||||
<version>1.0.0</version>
|
|
||||||
<authors>Oqtane.Application</authors>
|
|
||||||
<owners>Oqtane.Application</owners>
|
|
||||||
<title>Oqtane.Application</title>
|
|
||||||
<description>Oqtane.Application</description>
|
|
||||||
<copyright>Oqtane.Application</copyright>
|
|
||||||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
|
||||||
<license type="expression">MIT</license>
|
|
||||||
<projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
|
|
||||||
<icon>icon.png</icon>
|
|
||||||
<tags>oqtane module</tags>
|
|
||||||
<releaseNotes></releaseNotes>
|
|
||||||
<summary></summary>
|
|
||||||
<dependencies>
|
|
||||||
<dependency id="Oqtane.Framework" version="6.1.4" />
|
|
||||||
</dependencies>
|
|
||||||
</metadata>
|
|
||||||
<files>
|
|
||||||
<file src="..\Client\bin\Release\$targetframework$\$ProjectName$.Client.Oqtane.dll" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Client\bin\Release\$targetframework$\$ProjectName$.Client.Oqtane.pdb" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Server\bin\Release\$targetframework$\$ProjectName$.Server.Oqtane.dll" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Server\bin\Release\$targetframework$\$ProjectName$.Server.Oqtane.pdb" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.dll" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Shared\bin\Release\$targetframework$\$ProjectName$.Shared.Oqtane.pdb" target="lib\$targetframework$" />
|
|
||||||
<file src="..\Server\wwwroot\**\*.*" target="wwwroot" />
|
|
||||||
<file src="icon.png" target="" />
|
|
||||||
</files>
|
|
||||||
</package>
|
|
@ -1,11 +1 @@
|
|||||||
@echo off
|
|
||||||
set TargetFramework=%1
|
|
||||||
set ProjectName=%2
|
|
||||||
|
|
||||||
XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Server\bin\Debug\%TargetFramework%\%ProjectName%.Server.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.dll" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Shared\bin\Debug\%TargetFramework%\%ProjectName%.Shared.Oqtane.pdb" "..\AppHost\bin\Debug\%TargetFramework%\" /Y
|
|
||||||
XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I
|
XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I
|
@ -1,12 +1 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
TargetFramework=$1
|
|
||||||
ProjectName=$2
|
|
||||||
|
|
||||||
cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -f "../Server/bin/Debug/$TargetFramework/$ProjectName$.Server.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.dll" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -f "../Shared/bin/Debug/$TargetFramework/$ProjectName$.Shared.Oqtane.pdb" "../AppHost/bin/Debug/$TargetFramework/"
|
|
||||||
cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/"
|
cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/"
|
Binary file not shown.
Before Width: | Height: | Size: 4.8 KiB |
@ -1,2 +0,0 @@
|
|||||||
del "*.nupkg"
|
|
||||||
"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application
|
|
@ -1 +0,0 @@
|
|||||||
"nuget.exe" pack Oqtane.Application.nuspec -Properties projectname=Oqtane.Application
|
|
Reference in New Issue
Block a user