8000 Bugfix: BounceRunner.IsBounceExecutable() was resolving to *.dll.config when it should not have been by jvukovich · Pull Request #24 · jvukovich/bounce · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bugfix: BounceRunner.IsBounceExecutable() was resolving to *.dll.config when it should not have been #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 5, 2022
Merged

Bugfix: BounceRunner.IsBounceExecutable() was resolving to *.dll.config when it should not have been #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Bounce.Framework/Bounce.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
<PackageLicense>https://github.com/jvukovich/bounce/blob/master/LICENSE</PackageLicense>
<PackageTags>build CI deploy configuration</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>0.11.0-beta2</PackageVersion>
<Description>.NET Core 3.1 beta version of Bounce.Framework</Description>
<PackageVersion>0.11.0-beta3</PackageVersion>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PackageOutputPath>./bin/Release/NuGet</PackageOutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" AssemblyVersion="2.8.0" Version="2.8.0" />
<PackageReference Include="Serilog.Sinks.Console" AssemblyVersion="3.1.2-dev-00792" Version="3.1.2-dev-00792" />
<PackageReference Include="Serilog.Sinks.Debug" AssemblyVersion="1.0.2-dev-00020" Version="1.0.2-dev-00020" />
<PackageReference Include="Serilog" AssemblyVersion="2.8.0" Version="2.11.1-dev-01397" />
<PackageReference Include="Serilog.Sinks.Console" AssemblyVersion="3.1.2-dev-00792" Version="4.0.2-dev-00890" />
<PackageReference Include="Serilog.Sinks.Debug" AssemblyVersion="1.0.2-dev-00020" Version="2.0.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Bounce.Framework/BounceRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ private static bool IsBounceExecutable(string path)
{
var fileName = Path.GetFileName(path);

return fileName.ToLowerInvariant() != BounceFrameworkAssemblyFileName
&& new Regex(@"\bbounce\b.*\.(dll|exe)", RegexOptions.IgnoreCase)
.IsMatch(fileName);
return fileName.ToLowerInvariant() != BounceFrameworkAssemblyFileName &&
!fileName.ToLowerInvariant().EndsWith(".config") &&
new Regex(@"\bbounce\b.*\.(dll|exe)", RegexOptions.IgnoreCase).IsMatch(fileName);
}
}
}
12 changes: 6 additions & 6 deletions Bounce.Framework/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project>
<PropertyGroup>
<Version>0.11.0-beta1</Version>
<InformationalVersion>0.11.0-beta1</InformationalVersion>
<Version>0.11.0-beta3</Version>
<InformationalVersion>0.11.0-beta3</InformationalVersion>
<FileVersion>0.11.0</FileVersion>
<Title>Bounce.Framework</Title>
<Product>Bounce.Framework</Product>
<Company>NBucket, Inc.</Company>
<Copyright>Copyright 2018-2019 NBucket, Inc.</Copyright>
<Company>Cooperative Studios LLC</Company>
<Copyright>Copyright 2018-2022 Cooperative Studios LLC</Copyright>
<RepositoryUrl>https://github.com/jvukovich/bounce.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<ReleaseNotes>.NET Core 2.2 beta version of Bounce.Framework</ReleaseNotes>
<Description>.NET Core 2.2 beta version of Bounce.Framework</Description>
<ReleaseNotes>.NET Core beta version of Bounce.Framework</ReleaseNotes>
<Description>.NET Core beta version of Bounce.Framework</Description>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>
</Project>
7 changes: 5 additions & 2 deletions Bounce.Tests/Bounce.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit" AssemblyVersion="2.4.1" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" AssemblyVersion="2.4.1" Version="2.4.1" />
<PackageReference Include="xunit" AssemblyVersion="2.4.1" Version="2.4.2-pre.12" />
<PackageReference Include="xunit.runner.visualstudio" AssemblyVersion="2.4.1" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bounce.Framework\Bounce.Framework.csproj" />
Expand Down
3 changes: 1 addition & 2 deletions Bounce/Bounce.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<PackageLicense>https://github.com/jvukovich/bounce/blob/master/LICENSE</PackageLicense>
<PackageTags>build CI deploy configuration</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>0.11.0-beta2</PackageVersion>
<Description>.NET Core 3.1 beta version of Bounce</Description>
<PackageVersion>0.11.0-beta3</PackageVersion>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
12 changes: 6 additions & 6 deletions Bounce/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project>
<PropertyGroup>
<Version>0.11.0-beta1</Version>
<InformationalVersion>0.11.0-beta1</InformationalVersion>
<Version>0.11.0-beta3</Version>
<InformationalVersion>0.11.0-beta3</InformationalVersion>
<FileVersion>0.11.0</FileVersion>
<Title>Bounce</Title>
<Product>Bounce</Product>
<Company>NBucket, Inc.</Company>
<Copyright>Copyright 2018-2019 NBucket, Inc.</Copyright>
<Company>Cooperative Studios LLC</Company>
<Copyright>Copyright 2018-2022 Cooperative Studios LLC</Copyright>
<RepositoryUrl>https://github.com/jvukovich/bounce.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<ReleaseNotes>.NET Core 2.2 beta version of Bounce</ReleaseNotes>
<Description>.NET Core 2.2 beta version of Bounce</Description>
<ReleaseNotes>.NET Core beta version of Bounce</ReleaseNotes>
<Description>.NET Core beta version of Bounce</Description>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Tools/nuget_framework_push_release.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set /p API_KEY=<nuget_api_key.txt
cd ..\Bounce.Framework

dotnet pack --configuration Release
dotnet nuget push .\bin\Release\NuGet\Bounce.Framework.0.11.0-beta2.nupkg --source https://api.nuget.org/v3/index.json --api-key %API_KEY%
dotnet nug 6D4E et push .\bin\Release\NuGet\Bounce.Framework.0.11.0-beta3.nupkg --source https://api.nuget.org/v3/index.json --api-key %API_KEY%

pause
2 changes: 1 addition & 1 deletion Tools/nuget_framework_push_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ read -p 'nuget_api_key.txt: ' apiKey
cd ./Bounce.Framework

dotnet pack --configuration Release
dotnet nuget push ./bin/Release/NuGet/Bounce.Framework.0.11.0-beta2.nupkg --source https://api.nuget.org/v3/index.json --api-key "${apiKey}"
dotnet nuget push ./bin/Release/NuGet/Bounce.Framework.0.11.0-beta3.nupkg --source https://api.nuget.org/v3/index.json --api-key "${apiKey}"
)
2 changes: 1 addition & 1 deletion Tools/nuget_tool_push_release.bat
9E7A
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set /p API_KEY=<nuget_api_key.txt
cd ..\Bounce

dotnet pack --configuration Release
dotnet nuget push .\bin\Release\NuGet\Bounce.0.11.0-beta2.nupkg --source https://api.nuget.org/v3/index.json --api-key %API_KEY%
dotnet nuget push .\bin\Release\NuGet\Bounce.0.11.0-beta3.nupkg --source https://api.nuget.org/v3/index.json --api-key %API_KEY%

pause
2 changes: 1 addition & 1 deletion Tools/nuget_tool_push_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ read -p 'nuget_api_key.txt: ' apiKey
cd ./Bounce.Bounce

dotnet pack --configuration Release
dotnet nuget push ./bin/Release/NuGet/Bounce.0.11.0-beta2.nupkg --source https://api.nuget.org/v3/index.json --api-key "${apiKey}"
dotnet nuget push ./bin/Release/NuGet/Bounce.0.11.0-beta3.nupkg --source https://api.nuget.org/v3/index.json --api-key "${apiKey}"
)
0