Skip to content

Commit 8426c9c

Browse files
robertmuehsigrobertmuehsig
authored
Merge pull request #197 from ElectronNET/dev/cleanup-for-011
cleanups and licenseUrl for package fixed
2 parents a2efdb3 + da4a8df commit 8426c9c

File tree

5 files changed

+40
-9
lines changed

5 files changed

+40
-9
lines changed

‎Changelog.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
# not release
22

3+
4+
# 0.0.11
5+
36
ElectronNET.CLI:
47

58
* Invoke 'npm install' without --prod flag to install needed devDependencies as well.
9+
* Enable SourceLink
10+
* NuGet Package License Information updated (deprecation of licenseUrl)
11+
12+
ElectronNET.API:
13+
14+
* Documentation added for WebContents.GetUrl()
15+
* Enable SourceLink
16+
* NuGet Package License Information updated (deprecation of licenseUrl)
617

718
# 0.0.10
819

‎ElectronNET.API/ElectronNET.API.csproj

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

33
<PropertyGroup>
44
<TargetFramework>netcoreapp2.1</TargetFramework>
@@ -8,15 +8,17 @@
88
<Authors>Gregor Biswanger, Robert Muehsig</Authors>
99
<Company />
1010
<Product>Electron.NET</Product>
11-
<PackageLicenseUrl>https://github.com/ElectronNET/Electron.NET/blob/master/LICENSE</PackageLicenseUrl>
11+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1212
<PackageProjectUrl>https://github.com/ElectronNET/Electron.NET/</PackageProjectUrl>
1313
<Description>Building cross platform electron based desktop apps with .NET Core and ASP.NET NET Core.
1414
This package contains the API to access the "native" electron API.</Description>
1515
<RepositoryUrl>https://github.com/ElectronNET/Electron.NET/</RepositoryUrl>
16+
<RepositoryType>git</RepositoryType>
17+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1618
<PackageTags>electron aspnetcore</PackageTags>
1719
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
1820
<PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
19-
<Version>1.0.0.2</Version>
21+
<Version>1.0.0.0</Version>
2022
</PropertyGroup>
2123

2224
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -40,6 +42,10 @@ This package contains the API to access the "native" electron API.</Description>
4042
</Target>
4143
<ItemGroup>
4244
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
45+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05">
46+
<PrivateAssets>all</PrivateAssets>
47+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
48+
</PackageReference>
4349
<PackageReference Include="SocketIoClientDotNet" Version="1.0.5" />
4450
</ItemGroup>
4551

‎ElectronNET.API/WebContents.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ public Task<bool> PrintToPDFAsync(string path, PrintToPDFOptions options = null)
132132
return taskCompletionSource.Task;
133133
}
134134

135+
/// <summary>
136+
/// Is used to get the Url of the loaded page.
137+
/// It's usefull if a web-server redirects you and you need to know where it redirects. For instance, It's useful in case of Implicit Authorization.
138+
/// </summary>
139+
/// <returns>URL of the loaded page</returns>
135140
public Task<string> GetUrl()
136141
{
137142
var taskCompletionSource = new TaskCompletionSource<string>();

‎ElectronNET.CLI/ElectronNET.CLI.csproj

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@
99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<PackageOutputPath>..\artifacts</PackageOutputPath>
1111
<PackageId>ElectronNET.CLI</PackageId>
12-
<Version>1.0.4.2</Version>
12+
<Version>1.0.0.0</Version>
1313
<Authors>Gregor Biswanger, Robert Muehsig</Authors>
1414
<Product>Electron.NET</Product>
1515
<Company />
1616
<Description>Building cross platform electron based desktop apps with .NET Core and ASP.NET NET Core.
1717
This package contains the dotnet tooling to electronize your application.</Description>
18-
<PackageLicenseUrl>https://github.com/ElectronNET/Electron.NET/blob/master/LICENSE</PackageLicenseUrl>
18+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<PackageProjectUrl>https://github.com/ElectronNET/Electron.NET/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/ElectronNET/Electron.NET/</RepositoryUrl>
21+
<RepositoryType>git</RepositoryType>
22+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2123
<PackageTags>electron aspnetcore</PackageTags>
2224
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
2325
<PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
@@ -76,6 +78,13 @@ This package contains the dotnet tooling to electronize your application.</Descr
7678
<ItemGroup>
7779
<EmbeddedResource Include="..\ElectronNET.Host\api\clipboard.js" Link="ElectronHost\api\clipboard.js" />
7880
</ItemGroup>
81+
82+
<ItemGroup>
83+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05">
84+
<PrivateAssets>all</PrivateAssets>
85+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
86+
</PackageReference>
87+
</ItemGroup>
7988
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(OS)' == 'Windows_NT'">
8089
<Exec Command="$(ProjectDir)devCleanup.cmd" IgnoreExitCode="true" />
8190
</Target>

‎buildReleaseNuGetPackages.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ echo "Start building Electron.NET dev stack..."
22
echo "Restore & Build API"
33
cd ElectronNet.API
44
dotnet restore
5-
dotnet build --configuration Release --force /property:Version=0.0.10
6-
dotnet pack /p:Version=0.0.10 --configuration Release --force --output "%~dp0artifacts"
5+
dotnet build --configuration Release --force /property:Version=0.0.11
6+
dotnet pack /p:Version=0.0.11 --configuration Release --force --output "%~dp0artifacts"
77
cd ..
88
echo "Restore & Build CLI"
99
cd ElectronNet.CLI
1010
dotnet restore
11-
dotnet build --configuration Release --force /property:Version=0.0.10
12-
dotnet pack /p:Version=0.0.10 --configuration Release --force --output "%~dp0artifacts"
11+
dotnet build --configuration Release --force /property:Version=0.0.11
12+
dotnet pack /p:Version=0.0.11 --configuration Release --force --output "%~dp0artifacts"

0 commit comments

Comments
 (0)