Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Uptake the latest buildtools package, and new CLI #1294

Merged
merged 3 commits into from
Jan 10, 2017
Merged

Uptake the latest buildtools package, and new CLI #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745a7df
Uptake the latest buildtools package, and new CLI
dagood Jan 7, 2017
d003d41
Fix packaging tests: BuildTools TestPath change
dagood Jan 10, 2017
ca9a54a
Upgrade Run tool, ensure ConfigurationGroup passed
dagood Jan 10, 2017
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
2 changes: 1 addition & 1 deletion .cliversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0-preview3-003223
1.0.0-preview2-1-003182
4 changes: 2 additions & 2 deletions .toolversions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Microsoft.DotNet.BuildTools=1.0.26-prerelease-00802-01
Microsoft.DotNet.BuildTools.Run=1.0.0-prerelease-00807-04
Microsoft.DotNet.BuildTools=1.0.27-prerelease-01205-03
Microsoft.DotNet.BuildTools.Run=1.0.1-prerelease-01205-03
NuGet.CommandLine=3.4.3
1 change: 1 addition & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
"defaultValues":{
"toolName": "msbuild",
"settings": {
"ConfigurationGroup": "default",
"MsBuildLogging":"default"
}
}
Expand Down
4 changes: 3 additions & 1 deletion dir.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,16 @@
<!-- Set up the default output and intermediate paths -->
<PropertyGroup>
<OSPlatformConfig>$(OSGroup).$(Platform).$(ConfigurationGroup)</OSPlatformConfig>
<TestTargetOutputRelPath Condition="'$(TestTargetOutputRelPath)'=='' And '$(TargetGroup)'!='' And '$(TestTFM)'!=''">$(TargetGroup).$(TestTFM)/</TestTargetOutputRelPath>
<TestTargetOutputRelPath Condition="'$(TestTargetOutputRelPath)'=='' And '$(TargetGroup)'=='' And '$(TestTFM)'!=''">default.$(TestTFM)/</TestTargetOutputRelPath>

<BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath>
<OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)\$(MSBuildProjectName)\</OutputPath>

<IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)\</IntermediateOutputRootPath>
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)\</IntermediateOutputPath>

<TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\</TestPath>
<TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\$(TestTargetOutputRelPath)</TestPath>

<PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion run.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if ((Test-Path $bootStrapperPath) -eq 0)
}

# now execute it
& $bootStrapperPath (Get-Location) $toolsLocalPath | Out-File (Join-Path (Get-Location) "bootstrap.log")
& $bootStrapperPath (Get-Location) $toolsLocalPath -DotNetInstallBranch "rel/1.0.0-preview2.1" | Out-File (Join-Path (Get-Location) "bootstrap.log")
if ($LastExitCode -ne 0)
{
Write-Output "Boot-strapping failed with exit code $LastExitCode, see bootstrap.log for more information."
Expand Down
2 changes: 1 addition & 1 deletion ...oft.DotNet.Build.Tasks.Packaging/test/Microsoft.DotNet.Build.Tasks.Packaging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
https://github.com/dotnet/buildtools/issues/343 -->
<Target Name="CopyFrameworkLists" AfterTargets="CopyTestToTestDirectory" Inputs="%(TestTargetFramework.Folder)$(TestTFM)" Outputs="none">
<PropertyGroup>
<_testDirectory>$(TestPath)%(TestTargetFramework.Folder)$(TestTFM)</_testDirectory>
<_testDirectory>$(TestPath)</_testDirectory>
</PropertyGroup>
<ItemGroup>
<_frameworkList Include="..\src\FrameworkLists\**\*.xml">
Expand Down