-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from Mubicon/portToCore2.1
Port to core2.1
- Loading branch information
Showing
32 changed files
with
363 additions
and
349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,8 @@ nuget.exe | |
| *.ipch | ||
| .vs/ | ||
| project.lock.json | ||
|
|
||
| .envrc | ||
| .DS_Store | ||
| bower_components/ | ||
| node_modules/ | ||
| node_modules/ | ||
| .idea | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| dotnet-core 2.1.403 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| pack_client: | ||
| cd src/SwiftClient; dotnet pack -c Release | ||
| pack_service: | ||
| cd src/SwiftClient.AspNetCore; dotnet pack -c Release | ||
| push_client: | ||
| ./push_client.sh | ||
| push_service: | ||
| ./push_service.sh | ||
| upload_client: pack_client push_client | ||
| upload_service: pack_service push_service | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <packageSources> | ||
| <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
| <add key="mrcr.ru" value="https://nuget.mrcr.ru" /> | ||
| </packageSources> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| cd src/SwiftClient; dotnet nuget push -k ${NUGET_KEY} -s ${NUGET_SERVER} $(ls -dt bin/Release/* | head -1) | ||
|
|
||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -e | ||
|
|
||
| cd src/SwiftClient.AspNetCore; dotnet nuget push -k ${NUGET_KEY} -s ${NUGET_SERVER} $(ls -dt bin/Release/* | head -1) | ||
|
|
||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
samples/SwiftClient.AspNetCore.Demo/SwiftClient.AspNetCore.Demo.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <PreserveCompilationContext>true</PreserveCompilationContext> | ||
| <AssemblyName>SwiftClient.AspNetCore.Demo</AssemblyName> | ||
| <OutputType>Exe</OutputType> | ||
| <PackageId>SwiftClient.AspNetCore.Demo</PackageId> | ||
| <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion> | ||
| <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback> | ||
| <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="wwwroot\**\*;Views\**\*;Areas\**\Views"> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\SwiftClient\SwiftClient.csproj" /> | ||
| <ProjectReference Include="..\..\src\SwiftClient.AspNetCore\SwiftClient.AspNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" /> | ||
| <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" /> | ||
| <PackageReference Include="BundlerMinifier.Core" Version="2.1.258" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> | ||
| <Exec Command="bower install" /> | ||
| <Exec Command="dotnet bundle" /> | ||
| </Target> | ||
|
|
||
| <ItemGroup> | ||
| <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| </PropertyGroup> | ||
| </Project> |
23 changes: 0 additions & 23 deletions
23
samples/SwiftClient.AspNetCore.Demo/SwiftClient.AspNetCore.Demo.xproj
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Description>SwiftClient Command-line interface</Description> | ||
| <Authors>Stefan Prodan</Authors> | ||
| <AssemblyName>SwiftClient.Cli</AssemblyName> | ||
| <OutputType>Exe</OutputType> | ||
| <PackageId>SwiftClient.Cli</PackageId> | ||
| <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> | ||
| <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute> | ||
| <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> | ||
| <TargetFramework>netstandard2.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\SwiftClient\SwiftClient.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Newtonsoft.Json" Version="10.0.3" /> | ||
| <PackageReference Include="CommandLineParser" Version="2.0.275-beta" /> | ||
| <PackageReference Include="Humanizer" Version="2.2.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net461' "> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.