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.

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

RepoToolset update to 1.0.0-beta2-62718-01 #83

Merged
merged 6 commits into from Mar 20, 2018
Merged

RepoToolset update to 1.0.0-beta2-62718-01 #83

merged 6 commits into from Mar 20, 2018

Conversation

chcosta
Copy link
Member

@chcosta chcosta commented Mar 19, 2018

Move to RepoToolset version 1.0.0-beta2-62718-01

Addresses:

  • Rename build directory  #33 - rename build directory to eng

  • Define Version in Directory.Build.targets so that we can allow individual repos to define a "VersionBase" (defaults to 1.0.0 in eng\Version.props)

  • Define "NuSpecProperties" in Directory.Build.targets so that we can consume defined "Version"

  • Explicitly define "RepoRoot" when calling into "RepoToolset" (new requirement)

  • "SolutionPath" property is now replaced with "Projects"

@chcosta chcosta self-assigned this Mar 19, 2018
@chcosta
Copy link
Member Author

chcosta commented Mar 19, 2018

Making changes to CI so...

test ci please

@chcosta
Copy link
Member Author

chcosta commented Mar 19, 2018

test prtest/Ubuntu16.04/Debug

tmat
tmat reviewed Mar 20, 2018
View reviewed changes
Directory.Build.targets Outdated
<PropertyGroup>
<!-- Version must be defined after project has been imported so that versionbase (defined in repo's Version.props or
per project) and VersionSuffix (defined in RepoToolsets Version.props) are defined -->
<Version>$(VersionBase)-$(VersionSuffix)</Version>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tmat
tmat reviewed Mar 20, 2018
View reviewed changes
Directory.Build.targets Outdated
per project) and VersionSuffix (defined in RepoToolsets Version.props) are defined -->
<Version>$(VersionBase)-$(VersionSuffix)</Version>

<NuspecProperties>$(NuspecProperties);version=$(Version);licenseUrl=$(PackageLicenseUrl);repoUrl=$(RepositoryUrl);copyright=$(Copyright);ArtifactsBinDir=$(ArtifactsBinDir)</NuspecProperties>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tmat
tmat reviewed Mar 20, 2018
View reviewed changes
netci.groovy Outdated
}
else {
shell("./build/cibuild.sh --configuration ${configName}")
shell("./eng/common/cibuild.sh --configuration ${configName}")

This comment was marked as spam.

Sign in to view

@tmat
Copy link
Member

tmat commented Mar 20, 2018 

--prepareMachine)

bad casing.

Refers to: eng/common/build.sh:87 in fc22d39. [](commit_id = fc22d39, deletion_comment = False)

@tmat
Copy link
Member

tmat commented Mar 20, 2018 

--prepareMachine)

needs to be lowercase

In reply to: 374431226 [](ancestors = 374431226)

Refers to: build/build.sh:87 in fc22d39. [](commit_id = fc22d39, deletion_comment = False)

tmat
tmat approved these changes Mar 20, 2018
View reviewed changes
Copy link
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@chcosta
Copy link
Member Author

chcosta commented Mar 20, 2018

test ci please

@chcosta
Copy link
Member Author

chcosta commented Mar 20, 2018

Validated CI builds and VSTS builds, merging..

@chcosta chcosta merged commit ca2f92e into dotnet:master Mar 20, 2018
@chcosta chcosta deleted the dirchange branch March 20, 2018 01:03
@chcosta chcosta mentioned this pull request Mar 20, 2018
Closed
weshaggard
weshaggard reviewed Mar 20, 2018
View reviewed changes
src/Microsoft.DotNet.Build.Tasks.IO/Microsoft.DotNet.Build.Tasks.IO.csproj
@@ -7,7 +7,7 @@
<IsPackable>true</IsPackable>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
<NuspecProperties>version=$(Version);licenseUrl=$(PackageLicenseUrl);repoUrl=$(RepositoryUrl);copyright=$(Copyright);ArtifactsBinDir=$(ArtifactsBinDir);NetFxTfm=$(NetFxTfm)</NuspecProperties>
<NuspecProperties>NetFxTfm=$(NetFxTfm)</NuspecProperties>

This comment was marked as spam.

Sign in to view

weshaggard
weshaggard reviewed Mar 20, 2018
View reviewed changes
Directory.Build.targets
<Target Name="_InitializeNuspecProperties"
BeforeTargets="GenerateNuSpec">
<PropertyGroup>
<NuspecProperties>$(NuspecProperties);version=$(Version);licenseUrl=$(PackageLicenseUrl);repoUrl=$(RepositoryUrl);copyright=$(Copyright);ArtifactsBinDir=$(ArtifactsBinDir)</NuspecProperties>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

weshaggard
weshaggard reviewed Mar 20, 2018
View reviewed changes
.vsts-ci.yml
@@ -30,7 +30,7 @@ phases:
TeamName: $(__TeamName)
continueOnError: false
condition: and(succeeded(), in(variables.__SignType, 'real', 'test'))
- script: build\CIBuild.cmd -configuration $(buildConfig)
- script: eng\common\CIBuild.cmd -configuration $(buildConfig) -prepareMachine

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmat tmat tmat approved these changes

@weshaggard weshaggard weshaggard left review comments

@natemcmaster natemcmaster Awaiting requested review from natemcmaster

Assignees

@chcosta chcosta

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@chcosta @tmat @weshaggard