Upgrade AsyncGenerator to 0.17.1 #2182

maca88 · 2019-06-18T17:50:07Z

The version contains the fix for the issue discovered in #2056.

It also adds .Net Core support, and this PR switches the generation target framework to netcoreapp for better cross-platform development support.

maca88 · 2019-06-18T17:50:59Z

src/AsyncGenerator.yml

@@ -3,6 +3,8 @@
  targetFramework: net461
  concurrentRun: true
  applyChanges: true
+  suppressDiagnosticFailures:
+  - pattern: ^.*(Hql\.g).*$


The new version of Roslyn reports warnings for Hql.g, which have to be omitted.

src/NHibernate.Test/Async/NHSpecificTest/GH1547/Fixture.cs

default.build

bahusoid · 2019-06-18T18:12:48Z

It seems .NET Core support is also added in this version. Shouldn't we start using it right away? ) It's my understanding it would allow to skip installing mono for development process on Unix.

maca88 · 2019-06-18T18:24:30Z

Shouldn't we start using it right away?

Yes we could, the only reason I didn't use it is because the minimal .NET Core version is higher than what NHibernate has (netcoreapp2.1 vs netcoreapp2.0). If you are fine with that I will change it to .NET Core.

It's my understanding it would allow to skip installing mono for development process on Unix.

.NET Core would need to be installed instead.

bahusoid · 2019-06-18T19:47:58Z

because the minimal .NET Core version is higher than what NHibernate has (netcoreapp2.1 vs netcoreapp2.0). If you are fine with that I will change it to .NET Core.

I personally see no issues with that. But maybe I don't understand all the implications.

maca88 · 2019-06-18T20:15:58Z

The only implication is that a developer with .NET Core 2.0 installed would be able to build the project but not able to generate the async code. I've changed the nant build to use .NET Core, ShowBuildMenu.sh still needs to be changed, which I plan to do it tomorrow.

src/AsyncGenerator.yml

hazzik · 2019-06-18T21:14:45Z

@maca88, I was thinking about having a dotnet global tool. Is it feasible?

hazzik · 2019-06-19T10:01:38Z

Hi, I'm having issue on MacOS:

hazzik-mac:src hazzik$ dotnet ../Tools/CSharpAsyncGenerator.CommandLine.0.16.0/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll
21:59:58,517 INFO  CommandLine: AsyncGenerator

21:59:59,150 INFO  AsyncCodeGenerator: Generating async code started
21:59:59,559 INFO  AsyncCodeGenerator: Opening project '/Users/hazzik/Projects/nhibernate-core/src/NHibernate/NHibernate.csproj' started
22:00:02,021 FATAL CommandLine: System.InvalidOperationException: One or more errors occurred while opening the project:
Msbuild failed when processing the file '/Users/hazzik/Projects/nhibernate-core/src/NHibernate/NHibernate.csproj' with message: /usr/local/share/dotnet/sdk/3.0.100-preview4-011223/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.TargetingPackResolution.targets: (84, 5): The "ResolveFrameworkReferences" task failed unexpectedly.
System.IO.FileNotFoundException: Could not load file or assembly 'NuGet.Frameworks, Version=5.0.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35'. The system cannot find the file specified.

File name: 'NuGet.Frameworks, Version=5.0.0.4, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
   at Microsoft.NET.Build.Tasks.ResolveFrameworkReferences.ExecuteCore()
   at Microsoft.NET.Build.Tasks.TaskBase.Execute() in /_/src/Tasks/Common/TaskBase.cs:line 35
   at Microsoft.Build.BackEnd.TaskExecutionHost.Microsoft.Build.BackEnd.ITaskExecutionHost.Execute()
   at Microsoft.Build.BackEnd.TaskBuilder.ExecuteInstantiatedTask(ITaskExecutionHost taskExecutionHost, TaskLoggingContext taskLoggingContext, TaskHost taskHost, ItemBucket bucket, TaskExecutionMode howToExecuteTask)


Hint: For suppressing irrelevant errors use SuppressDiagnosticFailures option.
   at AsyncGenerator.AsyncCodeGenerator.CheckForErrors(MSBuildWorkspace workspace, String itemType, ImmutableArray`1 supressFailuresPredicates, ILogger logger)
   at AsyncGenerator.AsyncCodeGenerator.OpenProject(MSBuildWorkspace workspace, String filePath, ImmutableArray`1 supressFailuresPredicates, ILogger logger, CancellationToken cancellationToken)
   at AsyncGenerator.AsyncCodeGenerator.GenerateAsync(AsyncCodeConfiguration configuration, CancellationToken cancellationToken)
   at AsyncGenerator.CommandLine.Program.Main(String[] args)

hazzik · 2019-06-19T10:05:18Z

These work fine:

mono ../Tools/CSharpAsyncGenerator.CommandLine.0.16.0/tools/net461/AsyncGenerator.CommandLine.exe

mono ../Tools/CSharpAsyncGenerator.CommandLine.0.16.0/tools/net472/AsyncGenerator.CommandLine.exe

hazzik · 2019-06-19T10:12:09Z

ok, this seems to be an issue with the dotnet sdk version. I wonder how can we fix it?

hazzik · 2019-06-19T10:23:45Z

Works for SDK 2.1.700.

Does not work for SDK 2.2.300:

hazzik-mac:src hazzik$ dotnet new globaljson --sdk-version 2.2.300 --force
The template "global.json file" was created successfully.
hazzik-mac:src hazzik$ dotnet ../Tools/CSharpAsyncGenerator.CommandLine.0.16.0/tools/netcoreapp2.1/AsyncGenerator.CommandLine.dll
22:22:57,813 INFO  CommandLine: AsyncGenerator

22:22:58,321 INFO  AsyncCodeGenerator: Generating async code started
22:22:58,689 INFO  AsyncCodeGenerator: Opening project '/Users/hazzik/Projects/nhibernate-core/src/NHibernate/NHibernate.csproj' started
22:22:59,978 FATAL CommandLine: System.InvalidOperationException: One or more errors occurred while opening the project:
Msbuild failed when processing the file '/Users/hazzik/Projects/nhibernate-core/src/NHibernate/NHibernate.csproj' with message: /usr/local/share/dotnet/sdk/2.2.300/Sdks/Microsoft.NET.Sdk/targets/Microsoft.PackageDependencyResolution.targets: (208, 5): Error reading assets file: Error loading lock file '/Users/hazzik/Projects/nhibernate-core/src/NHibernate/obj/project.assets.json' : Could not load file or assembly 'Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed'. The system cannot find the file specified.

Hint: For suppressing irrelevant errors use SuppressDiagnosticFailures option.
   at AsyncGenerator.AsyncCodeGenerator.CheckForErrors(MSBuildWorkspace workspace, String itemType, ImmutableArray`1 supressFailuresPredicates, ILogger logger)
   at AsyncGenerator.AsyncCodeGenerator.OpenProject(MSBuildWorkspace workspace, String filePath, ImmutableArray`1 supressFailuresPredicates, ILogger logger, CancellationToken cancellationToken)
   at AsyncGenerator.AsyncCodeGenerator.GenerateAsync(AsyncCodeConfiguration configuration, CancellationToken cancellationToken)
   at AsyncGenerator.CommandLine.Program.Main(String[] args)

maca88 · 2019-06-19T16:46:00Z

I was thinking about having a dotnet global tool. Is it feasible?

I also thought about it but then I realized that it would not work as a specific version may be required for a repository (NHibernate.Caches) or branch (5.2.x) if installed as a global tool. Recently, I found out that in .NET Core 3 will be possible to have a tool installed locally (source search for "Upcoming changes in .NET Core 3.0"), which is ideal for this tool. I will check what has to be done and try to add support for it.

maca88 · 2019-06-19T16:52:46Z

this seems to be an issue with the dotnet sdk version. I wonder how can we fix it?

In .NET Core 2.2 Json.Newtonsoft was updated from v9 to v10 and for some reason there is no redirect to the new version. I've made a fix by adding a redirect (maca88/AsyncGenerator/pull/128).

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs

maca88 · 2019-06-19T17:32:55Z

@hazzik can you please verify if the current code works on MacOS?

maca88 · 2019-06-19T20:32:08Z

The current code does not compile on net461 and to resolve the problem maca88/AsyncGenerator/issues/129 must be resolved, which I plan to do it tomorrow.

ShowBuildMenu.sh

Tools/packages.config

ShowBuildMenu.bat

src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs

fredericDelaporte

When re-generatig async (under Windows, latest VS 2017 (15.9.16), no VS 2019), the obsolete class FutureBatch lose its GetResultsAsync member, causing compilation failures.

Signed-off-by: maca88 <bostjan.markezic@siol.net>

maca88 · 2019-09-25T19:42:53Z

Upgraded to version 0.17.1, which fixes the issue with FutureBatch and rebased to master.

bahusoid · 2019-09-26T06:02:55Z

Otherwise some distribution of Roslyn may omit the English localization and then the switch would not be honored.

English resource is embedded into project (see resource and project). And translations are provided as satellite assemblies. So I don't think that English localization can be omitted somehow.

src/NHibernate.Test/Linq/MathFTests.cs

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs

src/NHibernate.Test/Linq/MathFTests.cs

maca88 commented Jun 18, 2019

View reviewed changes

src/NHibernate.Test/Async/NHSpecificTest/GH1547/Fixture.cs Show resolved Hide resolved

maca88 commented Jun 18, 2019

View reviewed changes

default.build Outdated Show resolved Hide resolved

bahusoid reviewed Jun 18, 2019

View reviewed changes

src/AsyncGenerator.yml Outdated Show resolved Hide resolved

maca88 commented Jun 19, 2019

View reviewed changes

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs Show resolved Hide resolved

maca88 changed the title ~~Upgrade AsyncGenerator to 0.16.0~~ Upgrade AsyncGenerator to 0.16.1 Jun 19, 2019

maca88 changed the title ~~Upgrade AsyncGenerator to 0.16.1~~ WIP - Upgrade AsyncGenerator to 0.16.1 Jun 19, 2019

hazzik reviewed Jun 20, 2019

View reviewed changes

ShowBuildMenu.sh Show resolved Hide resolved

maca88 changed the title ~~WIP - Upgrade AsyncGenerator to 0.16.1~~ Upgrade AsyncGenerator to 0.16.2 Jun 21, 2019

maca88 mentioned this pull request Aug 16, 2019

Seems to not work with VS 2017 15.9.15 maca88/AsyncGenerator#132

Closed

fredericDelaporte reviewed Aug 27, 2019

View reviewed changes

Tools/packages.config Outdated Show resolved Hide resolved

Tools/packages.config Outdated Show resolved Hide resolved

Tools/packages.config Outdated Show resolved Hide resolved

bahusoid reviewed Aug 28, 2019

View reviewed changes

ShowBuildMenu.bat Outdated Show resolved Hide resolved

src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaValidator/SchemaValidateFixture.cs Show resolved Hide resolved

maca88 mentioned this pull request Sep 9, 2019

Merge 5.2.6 #2205

Merged

maca88 changed the title ~~Upgrade AsyncGenerator to 0.16.2~~ Upgrade AsyncGenerator to 0.17.0 Sep 10, 2019

fredericDelaporte reviewed Sep 14, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

maca88 added 8 commits September 25, 2019 21:38

Fix nunit

ec9455c

Fix ShowBuildMenu.sh

52394f4

Signed-off-by: maca88 <bostjan.markezic@siol.net>

Fix tests

bbc764b

Add NetFxOnlyAttribute

37621c1

Fix documentation build

39bb17c

Upgrade AsyncGenerator to 0.17.0 nhibernate#2205

a8facf0

Review changes

c3a78e9

Upgrade AsyncGenerator to 0.17.1

8f765cf

maca88 force-pushed the AsyncGenerator branch from 307bc51 to 8f765cf Compare September 25, 2019 19:42

maca88 changed the title ~~Upgrade AsyncGenerator to 0.17.0~~ Upgrade AsyncGenerator to 0.17.1 Sep 25, 2019

This comment has been minimized.

Sign in to view

maca88 mentioned this pull request Sep 26, 2019

Improve CS0103 error scanning for private methods maca88/AsyncGenerator#140

Closed

This comment has been minimized.

Sign in to view

fredericDelaporte reviewed Sep 27, 2019

View reviewed changes

src/NHibernate.Test/Linq/MathFTests.cs Show resolved Hide resolved

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs Show resolved Hide resolved

maca88 and others added 2 commits September 27, 2019 21:08

Removed partial for SqlClientBatchingBatcher

bc5f216

Explicit why TestFixture is lacking

e8e0af9

fredericDelaporte approved these changes Sep 28, 2019

View reviewed changes

src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs Show resolved Hide resolved

src/NHibernate.Test/Linq/MathFTests.cs Show resolved Hide resolved

fredericDelaporte merged commit 01effc3 into nhibernate:master Sep 29, 2019

fredericDelaporte added c: Async p: Minor t: Improvement r: Fixed labels Sep 29, 2019

fredericDelaporte added this to the 5.3 milestone Sep 29, 2019

maca88 deleted the AsyncGenerator branch February 28, 2020 23:47

hazzik added r: Replaced r: Fixed and removed r: Fixed r: Replaced labels May 18, 2020

Upgrade AsyncGenerator to 0.17.1 #2182

Upgrade AsyncGenerator to 0.17.1 #2182

Uh oh!

Conversation

maca88 commented Jun 18, 2019 • edited by fredericDelaporte Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

maca88 Jun 18, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bahusoid commented Jun 18, 2019

Uh oh!

maca88 commented Jun 18, 2019

Uh oh!

bahusoid commented Jun 18, 2019

Uh oh!

maca88 commented Jun 18, 2019

Uh oh!

Uh oh!

hazzik commented Jun 18, 2019

Uh oh!

hazzik commented Jun 19, 2019

Uh oh!

hazzik commented Jun 19, 2019

Uh oh!

hazzik commented Jun 19, 2019

Uh oh!

hazzik commented Jun 19, 2019

Uh oh!

maca88 commented Jun 19, 2019

Uh oh!

maca88 commented Jun 19, 2019

Uh oh!

Uh oh!

maca88 commented Jun 19, 2019

Uh oh!

maca88 commented Jun 19, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fredericDelaporte left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

maca88 commented Sep 25, 2019

Uh oh!

This comment has been minimized.

bahusoid commented Sep 26, 2019

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maca88 commented Jun 18, 2019 •

edited by fredericDelaporte

Loading

fredericDelaporte left a comment •

edited

Loading