Skip to content

Use defined project intermediate directory if it exists #333

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
JakeGinnivan merged 6 commits into from
Jan 16, 2015
Merged

Use defined project intermediate directory if it exists #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d87ed46
Use defined project intermediate directory instead of hardcoded $(Pro…
Jan 3, 2015
14a7a1b
Got name of property wrong on first commit
Jan 3, 2015
67ea194
Fix failing tests
bdhess Jan 12, 2015
265e5cd
Update UpdateAssemblyInfo.cs
bdhess Jan 12, 2015
ff8b57b
Remove copy paste error
bdhess Jan 12, 2015
2bda50f
Fix compliation errors
Jan 12, 2015
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
11 changes: 4 additions & 7 deletions GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ public class UpdateAssemblyInfo : Task
public string ProjectFile { get; set; }

[Required]
public string ProjectDir { get; set; }

[Required]
public string Configuration { get; set; }
public string IntermediateOutputPath { get; set; }

[Required]
public ITaskItem[] CompileFiles { get; set; }
Expand Down Expand Up @@ -138,14 +135,14 @@ void CreateTempAssemblyInfo(CachedVersion semanticVersion, Config configuration)
var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(configuration);

string tempFileName, tempDir;
if (string.IsNullOrEmpty(ProjectDir) || string.IsNullOrWhiteSpace(ProjectDir))
if (IntermediateOutputPath == null)
{
tempDir = TempFileTracker.TempPath;
tempFileName = string.Format("AssemblyInfo_{0}_{1}.g.cs", Path.GetFileNameWithoutExtension(ProjectFile), Path.GetRandomFileName());
}
else
{
tempDir = Path.Combine(ProjectDir, "obj", Configuration);
tempDir = Path.Combine(IntermediateOutputPath, "obj", assemblyInfo);
Directory.CreateDirectory(tempDir);
tempFileName = string.Format("GitVersionTaskAssemblyInfo.g.cs");
}
Expand All @@ -154,4 +151,4 @@ void CreateTempAssemblyInfo(CachedVersion semanticVersion, Config configuration)
File.WriteAllText(AssemblyInfoTempFilePath, assemblyInfo);
}
}
}
}
8 changes: 3 additions & 5 deletions GitVersionTask/NugetAssets/GitVersionTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
</PropertyGroup>
<PropertyGroup>
<IntermediateOutputPath Condition="$(IntermediateOutputPath) == '' Or $(IntermediateOutputPath) == '*Undefined*'">$(MSBuildProjectDirectory)obj\$(Configuration)\</IntermediateOutputPath>
<GitVersionAssemblyVersioningScheme Condition="$(GitVersionAssemblyVersioningScheme) == '' Or $(GitVersionAssemblyVersioningScheme) == '*Undefined*'"></GitVersionAssemblyVersioningScheme>
</PropertyGroup>

Expand All @@ -24,9 +23,8 @@
/>
<UpdateAssemblyInfo
SolutionDirectory="$(SolutionDir)"
ProjectFile="$(ProjectPath)"
ProjectDir="$(ProjectDir)"
Configuration="$(ConfigurationName)"
ProjectFile="$(MSBuildProjectFullPath)"
IntermediateOutputPath="$(IntermediateOutputPath)"
AssemblyVersioningScheme="$(GitVersionAssemblyVersioningScheme)"
CompileFiles ="@(Compile)">
<Output
Expand Down