Skip to content

Fix concurrency issue regression #47

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

Open
mnivet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix concurrency issue regression #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bd684
- Fix concurrency issue regression:
mnivet Feb 5, 2018
5c30b89
Change key of the Mutex to the filename instead of the full path of t…
mnivet Feb 6, 2018
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
55 changes: 28 additions & 27 deletions Baseclass.Contrib.Nuget.Output/Baseclass.Contrib.Nuget.Output.Build/NugetPackageManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,44 +68,45 @@ public bool TryGetUsedPackagesDependendingOnNugetOutput(out ITaskItem[] packages
using (var archive = Package.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read))
{
var nuspec = archive.GetParts().Single(part => part.Uri.ToString().EndsWith(".nuspec"));
var nugetSpec = Path.Combine(nupkgpath, Path.GetFileName(nuspec.Uri.ToString()));
var nuspecFilename = Path.GetFileName(nuspec.Uri.ToString());
var nugetSpec = Path.Combine(nupkgpath, nuspecFilename);

// use a mutex to ensure that only one process unzip the nuspec
// and that one process do not start reading it due to its existence while another one is still writing it.
if (!File.Exists(nugetSpec))
var mut = new Mutex(false, nuspecFilename);
var xml = new XmlDocument();
try
{
var mut = new Mutex(false, "UnzipNuSpec");
try
{
mut.WaitOne();
mut.WaitOne();

if (!File.Exists(nugetSpec))
try
if (!File.Exists(nugetSpec))
{
try
{
using (
var outputstream = new FileStream(nugetSpec, FileMode.Create,
FileAccess.ReadWrite, FileShare.None))
{
using (
var outputstream = new FileStream(nugetSpec, FileMode.Create,
FileAccess.ReadWrite, FileShare.None))
using (var nspecstream = nuspec.GetStream())
{
using (var nspecstream = nuspec.GetStream())
{
nspecstream.CopyTo(outputstream);
}
nspecstream.CopyTo(outputstream);
}
}
catch (IOException)
{
if (!File.Exists(nugetSpec))
throw;
}
}
finally
{
mut.ReleaseMutex();
}
catch (IOException)
{
if (!File.Exists(nugetSpec))
throw;
}
}
}

var xml = new XmlDocument();
xml.LoadXml(File.ReadAllText(nugetSpec));
xml.Load(nugetSpec);
}
finally
{
mut.ReleaseMutex();
}

var deps = xml.GetElementsByTagName("dependency");
foreach (XmlNode dep in deps)
{
Expand Down
4 changes: 2 additions & 2 deletions Baseclass.Contrib.Nuget.Output/Baseclass.Contrib.Nuget.Output.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<projectUrl>http://www.baseclass.ch/Contrib/Nuget</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Treats the "output" folder in an dependend nuget package as an additional special folder and copies it's content to the build folder</description>
<releaseNotes xml:space="preserve">- Added support for paket
- Added support for repository path configuration</releaseNotes>
<releaseNotes xml:space="preserve">- Fix concurrency issue regression
- Reduce scope of the mutex to optimize parallel compilations</releaseNotes>
<tags>Nuget Targets Copy Output build package convention</tags>
</metadata>
<files>
Expand Down