Skip to content

Commit

Permalink
Showing 6 changed files with 13 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -244,3 +244,4 @@ ModelManifest.xml
# FAKE - F# Make
.fake/
Tools/**
.idea/
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<AsyncGenerator xmlns="https://github.com/maca88/AsyncGenerator">
<Solution filePath="..\..\ExternalProjects\NHibernate\Source\src\NHibernate.sln">
<Solution filePath="../../ExternalProjects/NHibernate/Source/src/NHibernate.sln">
<Projects>
<Project name="NHibernate">
<Analyzation>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
projects:
- filePath: ..\..\ExternalProjects\NHibernate\Source\src\NHibernate\NHibernate.csproj
- filePath: ../../ExternalProjects/NHibernate/Source/src/NHibernate/NHibernate.csproj
concurrentRun: true
applyChanges: true
analyzation:
@@ -158,7 +158,7 @@
assemblyName: AsyncGenerator.Core
- type: AsyncGenerator.Core.Plugins.EmptyRegionRemover
assemblyName: AsyncGenerator.Core
- filePath: ..\..\ExternalProjects\NHibernate\Source\src\NHibernate.DomainModel\NHibernate.DomainModel.csproj
- filePath: ../../ExternalProjects/NHibernate/Source/src/NHibernate.DomainModel/NHibernate.DomainModel.csproj
concurrentRun: true
applyChanges: true
analyzation:
@@ -173,7 +173,7 @@
/// <content>
/// Contains generated async methods
/// </content>
- filePath: ..\..\ExternalProjects\NHibernate\Source\src\NHibernate.Test\NHibernate.Test.csproj
- filePath: ../../ExternalProjects/NHibernate/Source/src/NHibernate.Test/NHibernate.Test.csproj
concurrentRun: true
applyChanges: true
analyzation:
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
solution:
filePath: ..\..\ExternalProjects\NHibernate\Source\src\NHibernate.sln
filePath: ../../ExternalProjects/NHibernate/Source/src/NHibernate.sln
concurrentRun: true
applyChanges: true
suppressDiagnosticFailures:
12 changes: 6 additions & 6 deletions Source/AsyncGenerator.sln
Original file line number Diff line number Diff line change
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.13
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator", "AsyncGenerator\AsyncGenerator.csproj", "{9D321EA8-54AE-4741-86A8-12198551AD67}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator", "AsyncGenerator/AsyncGenerator.csproj", "{9D321EA8-54AE-4741-86A8-12198551AD67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Tests", "AsyncGenerator.Tests\AsyncGenerator.Tests.csproj", "{0A3D852A-5C81-4E74-AC16-85BA2EBF3581}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Tests", "AsyncGenerator.Tests/AsyncGenerator.Tests.csproj", "{0A3D852A-5C81-4E74-AC16-85BA2EBF3581}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.TestCases", "AsyncGenerator.TestCases\AsyncGenerator.TestCases.csproj", "{A183D706-0DBB-4F6B-92A5-6359660255D7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.TestCases", "AsyncGenerator.TestCases/AsyncGenerator.TestCases.csproj", "{A183D706-0DBB-4F6B-92A5-6359660255D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Core", "AsyncGenerator.Core\AsyncGenerator.Core.csproj", "{7F45BDB9-6B8D-421F-9F91-D92AAB8F0F24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Core", "AsyncGenerator.Core/AsyncGenerator.Core.csproj", "{7F45BDB9-6B8D-421F-9F91-D92AAB8F0F24}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Configuration.Yaml", "AsyncGenerator.Configuration.Yaml\AsyncGenerator.Configuration.Yaml.csproj", "{C130CF5A-6543-4396-99C3-E223FF3C5EEE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.Configuration.Yaml", "AsyncGenerator.Configuration.Yaml/AsyncGenerator.Configuration.Yaml.csproj", "{C130CF5A-6543-4396-99C3-E223FF3C5EEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.CommandLine", "AsyncGenerator.CommandLine\AsyncGenerator.CommandLine.csproj", "{BF73EAAC-697E-456C-A323-3DF13A00EC64}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncGenerator.CommandLine", "AsyncGenerator.CommandLine/AsyncGenerator.CommandLine.csproj", "{BF73EAAC-697E-456C-A323-3DF13A00EC64}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ private AsyncCodeConfiguration ConfigureFromFile(string filePath, IFileConfigura
{
throw new FileNotFoundException($"Configuration file not found. Path:'{filePath}'");
}
return ConfigureFromStream(File.OpenRead(filePath), fileConfigurator, Path.GetDirectoryName(filePath) + @"\");
return ConfigureFromStream(File.OpenRead(filePath), fileConfigurator, Path.GetDirectoryName(filePath));
}

private AsyncCodeConfiguration ConfigureFromStream(Stream stream, IFileConfigurator fileConfigurator, string basePath = null)
@@ -139,10 +139,6 @@ private static string GetExecutingDirectory()
var uri = new UriBuilder(codeBase);
var assemblyPath = Uri.UnescapeDataString(uri.Path);
var dir = Path.GetDirectoryName(assemblyPath);
if (!dir.EndsWith(@"\"))
{
dir += @"\";
}
return dir;
}
}

0 comments on commit afbcbd7

Please sign in to comment.