Skip to content

Commit 267b4cb

Browse files
committed
updated flubu web api to .net 10... no older version are silmutanously suported.
1 parent 507debf commit 267b4cb

15 files changed

Lines changed: 36 additions & 212 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
## FlubuCore 10.0.1.0
2+
- Fixed CaptureOutput on RunProgramTask
3+
14
## FlubuCore 10.0.0.0
5+
- Updated to .net 10
26

37
## FlubuCore 9.0.0.0
48
## FlubuCore 8.0.0.0

src/FlubuCore.Tests/FlubuCore.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1313
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
1414
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
15-
<Version>10.0.0</Version>
16-
<AssemblyVersion>10.0.0.0</AssemblyVersion>
17-
<FileVersion>10.0.0.0</FileVersion>
15+
<Version>10.0.1</Version>
16+
<AssemblyVersion>10.0.1.0</AssemblyVersion>
17+
<FileVersion>10.0.1.0</FileVersion>
1818
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
1919
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>
2020
</PropertyGroup>

src/FlubuCore.Tool/FlubuCore.Tool.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
2222
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
2323
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
24-
<AssemblyVersion>10.0.0.0</AssemblyVersion>
25-
<FileVersion>10.0.0.0</FileVersion>
26-
<Version>10.0.0</Version>
24+
<AssemblyVersion>10.0.1.0</AssemblyVersion>
25+
<FileVersion>10.0.1.0</FileVersion>
26+
<Version>10.0.1</Version>
2727
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
2828
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>
2929
</PropertyGroup>

src/FlubuCore.WebApi.Client/FlubuCore.WebApi.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Detailed examples can be found at: https://github.com/dotnetcore/FlubuCore.Examples
2020
</Description>
21-
<Version>10.0.0</Version><AssemblyVersion>10.0.0.0</AssemblyVersion><FileVersion>10.0.0.0</FileVersion></PropertyGroup>
21+
<Version>10.0.1</Version><AssemblyVersion>10.0.1.0</AssemblyVersion><FileVersion>10.0.1.0</FileVersion></PropertyGroup>
2222

2323
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net462|AnyCPU'">
2424
<DocumentationFile>bin\Debug\net462\FlubuCore.WebApi.Client.xml</DocumentationFile>

src/FlubuCore.WebApi.Model/FlubuCore.WebApi.Model.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Detailed examples can be found at: https://github.com/dotnetcore/FlubuCore.Examples
2020
</Description>
21-
<Version>10.0.0</Version><AssemblyVersion>10.0.0.0</AssemblyVersion><FileVersion>10.0.0.0</FileVersion></PropertyGroup>
21+
<Version>10.0.1</Version><AssemblyVersion>10.0.1.0</AssemblyVersion><FileVersion>10.0.1.0</FileVersion></PropertyGroup>
2222

2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
2424
<DocumentationFile>bin\Debug\netstandard2.0\FlubuCore.WebApi.Model.xml</DocumentationFile>

src/FlubuCore.WebApi/Controllers/PackagesController.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
using Microsoft.AspNetCore.Authentication.JwtBearer;
1010
using Microsoft.AspNetCore.Authorization;
1111
using Microsoft.AspNetCore.Mvc;
12-
#if NETCOREAPP3_1
13-
using Microsoft.Extensions.Hosting;
14-
#else
15-
using IHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
16-
#endif
12+
using Microsoft.Extensions.Hosting;
1713
using Microsoft.Extensions.Logging;
1814
using Microsoft.Extensions.Primitives;
1915
using Newtonsoft.Json;

src/FlubuCore.WebApi/Controllers/ReportsController.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
using Microsoft.AspNetCore.Authentication.JwtBearer;
1414
using Microsoft.AspNetCore.Authorization;
1515
using Microsoft.AspNetCore.Mvc;
16-
#if NETCOREAPP3_1
17-
using Microsoft.Extensions.Hosting;
18-
#else
19-
using IHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
20-
#endif
16+
using Microsoft.Extensions.Hosting;
2117

2218
namespace FlubuCore.WebApi.Controllers
2319
{

src/FlubuCore.WebApi/Controllers/ScriptsController.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
using Microsoft.AspNetCore.Authentication.JwtBearer;
1717
using Microsoft.AspNetCore.Authorization;
1818
using Microsoft.AspNetCore.Mvc;
19-
#if NETCOREAPP3_1
20-
using Microsoft.Extensions.Hosting;
21-
#else
22-
using IHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
23-
#endif
2419
using Microsoft.Build.Framework;
20+
using Microsoft.Extensions.Hosting;
2521
using Microsoft.Extensions.Logging;
2622
using Microsoft.Extensions.Options;
2723
using Swashbuckle.AspNetCore.Annotations;

src/FlubuCore.WebApi/Controllers/WebApp/ScriptController.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
using Microsoft.AspNetCore.Authorization;
1414
using Microsoft.AspNetCore.Mvc;
1515
using Microsoft.AspNetCore.Mvc.Rendering;
16+
using Microsoft.Extensions.Hosting;
1617
using Microsoft.Extensions.Options;
17-
#if NETCOREAPP3_1
18-
using Microsoft.Extensions.Hosting;
19-
#else
20-
using IHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
21-
#endif
2218

2319
namespace FlubuCore.WebApi.Controllers.WebApp
2420
{

src/FlubuCore.WebApi/Controllers/WebApp/UpdateCenterController.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
using Microsoft.AspNetCore.Authentication.Cookies;
1717
using Microsoft.AspNetCore.Authorization;
1818
using Microsoft.AspNetCore.Mvc;
19-
#if NETCOREAPP3_1
20-
using Microsoft.Extensions.Hosting;
21-
#else
22-
using IHostApplicationLifetime = Microsoft.AspNetCore.Hosting.IApplicationLifetime;
23-
using IHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
24-
#endif
19+
using Microsoft.Extensions.Hosting;
2520
using Octokit;
2621

2722
namespace FlubuCore.WebApi.Controllers.WebApp
@@ -121,10 +116,7 @@ public async Task<IActionResult> Prepare()
121116
}
122117
else
123118
{
124-
bool is64BitProcess = true;
125-
#if NET462
126-
is64BitProcess = Environment.Is64BitProcess;
127-
#endif
119+
bool is64BitProcess = Environment.Is64BitProcess;
128120
var filteredAssets = latestRelease.Assets.Where(x => x.Name.Contains("Net462"));
129121

130122
if (is64BitProcess)

0 commit comments

Comments
 (0)