Skip to content

Commit

Permalink
Dev (#35)
Browse files Browse the repository at this point in the history
* Feature/ci (#18)

* test ci

* try to release on github

* deploy only in master

* beautify readme

* try to fix deploy in master only

* Feature/ci (#20)

* test

* test

* fix

* fix

* dont deploy in pr

* fix base url

* fix warnings

* update packages

* Bug/23 (#27)

* #23 add tests

* add matcher

* ignore rider files

* add more tests

* fix one case, break another

* fix #23

* add logs formatting

* Task/dotnet3.1 (#33)

* move to dotnet3.1

* remove hardcoded sentry release

* Hotfix/types (#34)

* fix

* fix
  • Loading branch information
framebassman committed Jun 19, 2020
1 parent fa760d5 commit 76badf5
Show file tree
Hide file tree
Showing 16 changed files with 9,123 additions and 11,371 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
language: csharp
dist: xenial
mono: none
dotnet: 2.2
dotnet: 3.1
install:
- dotnet clean
- dotnet restore
Expand All @@ -14,7 +14,7 @@ jobs:

- language: node_js
node_js:
- 10.15.0
- 12.15.0
before_install:
- cd Izzy.Web/Client/
install:
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"processId": "${command:pickProcess}"
},
{
"name": ".NET Core Launch (web)",
"name": "Debug .NET Core Application",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/Izzy.Web/bin/Debug/netcoreapp2.2/Izzy.Web.dll",
"program": "${workspaceFolder}/Izzy.Web/bin/Debug/netcoreapp3.1/Izzy.Web.dll",
"args": [],
"cwd": "${workspaceFolder}/Izzy.Web",
"stopAtEntry": false,
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
FROM microsoft/dotnet:2.2-sdk AS build-env
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201-alpine3.11 AS build-env

RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
RUN apt-get install -y nodejs
RUN apk add --update 'nodejs=12.15.0-r1' 'npm=12.15.0-r1'

COPY ./Izzy.Web /app
WORKDIR /app
RUN dotnet clean
RUN dotnet restore
RUN dotnet publish -c Release -o out

FROM microsoft/dotnet:2.2.0-aspnetcore-runtime
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.3-alpine3.11
WORKDIR /app
COPY --from=build-env /app/out .
ENTRYPOINT dotnet Izzy.Web.dll
43 changes: 21 additions & 22 deletions Izzy.Web.Tests/Izzy.Web.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="NHamcrest" Version="2.0.1" />
<PackageReference Include="NHamcrest.XUnit" Version="2.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Izzy.Web\Izzy.Web.csproj" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NHamcrest" Version="2.0.1" />
<PackageReference Include="NHamcrest.XUnit" Version="2.0.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Izzy.Web\Izzy.Web.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit 76badf5

Please sign in to comment.