Skip to content
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

Jump to bottom

Merge release/2.1 into master #1804

Merged
merged 7 commits into from
Dec 9, 2017
Merged

Merge release/2.1 into master #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3fde63
Merge pull request #1795 from tannergooding/release/2.1
tannergooding Dec 5, 2017
75da957
Revert "Updating a test helper method to use GetFullPath (#1786)"
tannergooding Dec 8, 2017
41b768f
Fixing the build and netci.groovy scripts
tannergooding Dec 8, 2017
88dc0d4
Merge pull request #1809 from tannergooding/release/2.0.0
tannergooding Dec 8, 2017
00e489a
Merge remote-tracking branch 'dotnet/release/2.0.0' into release/2.1
tannergooding Dec 8, 2017
9d627aa
Merge remote-tracking branch 'dotnet/release/2.1'
tannergooding Dec 8, 2017
739c525
Fixing up SignToolData.json to use netcoreapp2.0
tannergooding Dec 8, 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
8 changes: 4 additions & 4 deletions build/SignToolData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"certificate": "Microsoft402",
"strongName": "MsSharedLib72",
"values": [
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp1.0/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp1.0/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp2.0/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/netcoreapp2.0/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/net46/Microsoft.NET.Build.Tasks.dll",
"bin/Sdks/Microsoft.NET.Sdk/tools/net46/*/Microsoft.NET.Build.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp1.0/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp1.0/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp2.0/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/netcoreapp2.0/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/net46/Microsoft.NET.Build.Extensions.Tasks.dll",
"bin/Sdks/Microsoft.NET.Build.Extensions/msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/tools/net46/*/Microsoft.NET.Build.Extensions.Tasks.resources.dll",
]
Expand Down
13 changes: 9 additions & 4 deletions netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,20 @@ def static getBuildJobName(def configuration, def os) {
}
}

Utilities.setMachineAffinity(newJob, osBase, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Utilities.addGithubPRTriggerForBranch(newJob, branch, "$os $config")
}

Utilities.addXUnitDotNETResults(newJob, "artifacts/$config/TestResults/*.xml", false)

def archiveSettings = new ArchivalSettings()
archiveSettings.addFiles("artifacts/$config/log/*")
archiveSettings.addFiles("artifacts/$config/TestResults/*")
archiveSettings.setFailIfNothingArchived()
archiveSettings.setArchiveOnFailure()
Utilities.setMachineAffinity(newJob, osBase, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
Utilities.addGithubPRTriggerForBranch(newJob, branch, "$os $config")
Utilities.addXUnitDotNETResults(newJob, "artifacts/$config/TestResults/*.xml", false)
Utilities.addArchival(newJob, archiveSettings)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void It_builds_the_library_twice_in_a_row()
.Pass();
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/1810")]
public void All_props_and_targets_add_themselves_to_MSBuildAllTargets()
{
// Disable this test when using full Framework MSBuild, as the paths to the props and targets are different
Expand Down