Skip to content

Commit e25b89f

Browse files
committed
Update to .NET Core 3.0
1 parent 5157561 commit e25b89f

File tree

14 files changed

+40
-33
lines changed

14 files changed

+40
-33
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: csharp
22
mono: none
33
dist: xenial
4-
dotnet: 2.2
4+
dotnet: 3.0
55
before_script:
66
- export PATH="$PATH:/home/travis/.dotnet/tools"
77
- npm install electron-packager --global

ElectronNET.API/ElectronNET.API.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageOutputPath>..\artifacts</PackageOutputPath>
77
<PackageId>ElectronNET.API</PackageId>
@@ -17,7 +17,7 @@ This package contains the API to access the "native" electron API.</Description>
1717
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1818
<PackageTags>electron aspnetcore</PackageTags>
1919
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
20-
<PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
20+
<PackageIcon>PackageIcon.png</PackageIcon>
2121
<Version>1.0.0.0</Version>
2222
</PropertyGroup>
2323

@@ -26,22 +26,26 @@ This package contains the API to access the "native" electron API.</Description>
2626
</PropertyGroup>
2727

2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
29-
<DocumentationFile>bin\Release\netcoreapp2.0\ElectronNET.API.xml</DocumentationFile>
29+
<DocumentationFile>bin\Release\netcoreapp3.0\ElectronNET.API.xml</DocumentationFile>
3030
</PropertyGroup>
3131

3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
33-
<DocumentationFile>bin\Debug\netcoreapp2.0\ElectronNET.API.xml</DocumentationFile>
33+
<DocumentationFile>bin\Debug\netcoreapp3.0\ElectronNET.API.xml</DocumentationFile>
3434
<Optimize>true</Optimize>
3535
</PropertyGroup>
3636

37+
<ItemGroup>
38+
<None Include="PackageIcon.png" Pack="true" PackagePath="\"/>
39+
</ItemGroup>
40+
3741
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
3842
<Exec Command="$(ProjectDir)devCleanup.cmd" IgnoreExitCode="true" />
3943
</Target>
4044
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' != 'Windows_NT'">
4145
<Exec Command="$(ProjectDir)devCleanup.sh" IgnoreExitCode="true" />
4246
</Target>
4347
<ItemGroup>
44-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
48+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
4549
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05">
4650
<PrivateAssets>all</PrivateAssets>
4751
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

ElectronNET.API/PackageIcon.png

38.5 KB
Loading

ElectronNET.CLI/ElectronNET.CLI.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66
<AssemblyName>electronize</AssemblyName>
77

88
<PackageType>DotnetCliTool</PackageType>
@@ -22,7 +22,7 @@ This package contains the dotnet tooling to electronize your application.</Descr
2222
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2323
<PackageTags>electron aspnetcore</PackageTags>
2424
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
25-
<PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
25+
<PackageIcon>PackageIcon.png</PackageIcon>
2626
<PackAsTool>true</PackAsTool>
2727
</PropertyGroup>
2828

@@ -38,7 +38,11 @@ This package contains the dotnet tooling to electronize your application.</Descr
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3939
<DocumentationFile></DocumentationFile>
4040
</PropertyGroup>
41-
41+
42+
<ItemGroup>
43+
<None Include="PackageIcon.png" Pack="true" PackagePath="\"/>
44+
</ItemGroup>
45+
4246
<ItemGroup>
4347
<EmbeddedResource Include="..\ElectronNET.Host\electron.manifest.json" Link="ElectronHost\electron.manifest.json" />
4448
</ItemGroup>

ElectronNET.CLI/PackageIcon.png

38.5 KB
Loading

ElectronNET.WebApp/Controllers/TrayController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace ElectronNET.WebApp.Controllers
88
{
99
public class TrayController : Controller
1010
{
11-
private readonly IHostingEnvironment _env;
11+
private readonly IWebHostEnvironment _env;
1212

13-
public TrayController(IHostingEnvironment env)
13+
public TrayController(IWebHostEnvironment env)
1414
{
1515
_env = env;
1616
}

ElectronNET.WebApp/ElectronHostHook/excelCreator.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.WebApp/ElectronHostHook/excelCreator.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.WebApp/ElectronHostHook/index.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.WebApp/ElectronHostHook/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)