Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

don't migrate context on MySql

Browse Source
This commit is contained in:
RaidMax
2018-04-07 16:47:21 -05:00
parent d8a7095906
commit 3c3adb062e
13 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WebfrontCore/BuildScripts/PostBuild.bat
View File

@ -1,7 +1,16 @@
set SolutionDir=%1
set SolutionDir=%1
set ProjectDir=%2
set TargetDir=%3
if not exist "%ProjectDir%LibSQLCE\x86" (
md "%TargetDir%x86" xcopy /y "%ProjectDir%LibSQLCE\x86" "%TargetDir%x86\"
)
if not exist "%TargetDir%x86" (
echo "Copying SQLCe binaries"
md "%TargetDir%x86"
xcopy /y "%SolutionDir%SharedLibrary\LibSQLCe\x86" "%TargetDir%x86\"
)
if not exist "%TargetDir%Plugins" (
echo "Making plugin dir"
md "%TargetDir%Plugins"
)
xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"

7
WebfrontCore/BuildScripts/PostPublish.bat
View File

@ -2,5 +2,8 @@ set SolutionDir=%1
set ProjectDir=%2
set TargetDir=%3
xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\Plugins\"
xcopy /Y "%SolutionDir%SharedLibrary\LibSQLCe\x86" "%SolutionDir%Publish\x86\"
if "TargetDir" == "*Undefined*" (
echo "Copying extra files to publish dir"
xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\Plugins\"
xcopy /Y "%SolutionDir%SharedLibrary\LibSQLCe\x86" "%SolutionDir%Publish\x86\"
)

11
WebfrontCore/BuildScripts/PreBuild.bat
View File

@ -1,10 +1,3 @@
set SolutionDir=%1
set SolutionDir=%1
set ProjectDir=%2
if not exist "%SolutionDir%BUILD" (
mkdir "%SolutionDir%BUILD"
)
if not exist "%SolutionDir%BUILD\userraw\scripts" (
mkdir "%SolutionDir%BUILD\userraw\scripts"
)
set TargetDir=%3

8
WebfrontCore/Controllers/AccountController.cs
View File

@ -25,10 +25,10 @@ namespace WebfrontCore.Controllers
{
var claims = new[]
{
new Claim(ClaimTypes.NameIdentifier, client.Name),
new Claim(ClaimTypes.Role, client.Level.ToString()),
new Claim(ClaimTypes.Sid, client.ClientId.ToString())
};
new Claim(ClaimTypes.NameIdentifier, client.Name),
new Claim(ClaimTypes.Role, client.Level.ToString()),
new Claim(ClaimTypes.Sid, client.ClientId.ToString())
};
var claimsIdentity = new ClaimsIdentity(claims, "login");
var claimsPrinciple = new ClaimsPrincipal(claimsIdentity);

4
WebfrontCore/Properties/PublishProfiles/FolderProfile.pubxml → WebfrontCore/Properties/PublishProfiles/Release - S.pubxml
View File

@ -8,13 +8,13 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<WebPublishMethod>FileSystem</WebPublishMethod>
<PublishProvider>FileSystem</PublishProvider>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>x86</LastUsedPlatform>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<ProjectGuid>65340d7d-5831-406c-acad-b13ba634bde2</ProjectGuid>
<publishUrl>C:\Projects\IW4M-Admin\Publish</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles>
<DeleteExistingFiles>True</DeleteExistingFiles>
<TargetFramework>net452</TargetFramework>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
</PropertyGroup>

14
WebfrontCore/WebfrontCore.csproj
View File

@ -47,7 +47,6 @@
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
@ -97,11 +96,12 @@
<Folder Include="Views\Account\" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent Condition=" '$(OS)' != 'Unix' ">if not exist "$(ProjectDir)LibSQLCE\x86" md "$(TargetDir)x86" xcopy /y "$(ProjectDir)LibSQLCE\x86" "$(TargetDir)x86\"</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Unix' ">if not exist "$(SolutionDir)BUILD" mkdir "$(SolutionDir)BUILD" if not exist "$(SolutionDir)BUILD\userraw\scripts" mkdir "$(SolutionDir)BUILD\userraw\scripts"</PreBuildEvent>
</PropertyGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="call BuildScripts/PreBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir)" />
</Target>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="call BuildScripts/PostBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir)&#xD;&#xA;call BuildScripts/PostPublish.bat $(SolutionDir) $(ProjectDir) $(TargetDir)" />
</Target>
</Project>