From c2e4a74f7d38f34522c379e55cd8edd75bf82930 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 17 Oct 2018 10:24:18 -0700 Subject: [PATCH] React to renaming this repo from Universe to AspNetCore --- .azure/pipelines/fast-pr-validation.yml | 2 +- Directory.Build.props | 2 +- README.md | 6 +++--- build/PackageArchive.targets | 2 +- build/RepositoryBuild.targets | 2 +- .../lineups/Internal.AspNetCore.Universe.Lineup.nuspec | 2 +- build/repo.beforecommon.props | 2 +- build/repo.props | 2 +- build/repo.targets | 8 ++++---- dockerbuild.sh | 2 +- docs/Submodules.md | 10 +++++----- scripts/GenerateTags.ps1 | 10 +++++----- scripts/UpdateRepos.ps1 | 6 +++--- scripts/common.psm1 | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml index e91c970c6b..863270dc71 100644 --- a/.azure/pipelines/fast-pr-validation.yml +++ b/.azure/pipelines/fast-pr-validation.yml @@ -14,7 +14,7 @@ resources: phases: - template: .vsts-pipelines/templates/project-ci.yml@buildtools parameters: - buildArgs: "/t:CheckUniverse" + buildArgs: "/t:FastCheck" - phase: DataProtection queue: Hosted VS2017 steps: diff --git a/Directory.Build.props b/Directory.Build.props index 4316633c71..7cfecbbe60 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Microsoft ASP.NET Core $(MSBuildThisFileDirectory) - https://github.com/aspnet/Universe + https://github.com/aspnet/AspNetCore git $(MSBuildThisFileDirectory)eng\AspNetCore.snk true diff --git a/README.md b/README.md index 9bc4f71e9a..4208c2744f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Universe +ASP.NET Core ======== Build infrastructure used to produce the whole ASP.NET Core stack. @@ -87,8 +87,8 @@ RedHat/Fedora (x64) | [Installer (rpm)][redhat-x64-rpm] ## Building from source ``` -git clone --recursive https://github.com/aspnet/Universe.git -cd Universe +git clone --recursive https://github.com/aspnet/AspNetCore.git +cd AspNetCore ./build.cmd ``` diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index bb892d102c..5ba1cadcf8 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -1,5 +1,5 @@ - + diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index a97112a561..428b35b65d 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -96,7 +96,7 @@ - + diff --git a/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec b/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec index cc35b59699..1209016b04 100644 --- a/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec +++ b/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec @@ -4,7 +4,7 @@ Internal.AspNetCore.Universe.Lineup $version$ Microsoft - This package used to unify ASP.NET Core package versions across all Universe repos. Internal use only. + This package used to unify ASP.NET Core package versions across all ASP.NET Core repos. Internal use only. diff --git a/build/repo.beforecommon.props b/build/repo.beforecommon.props index 0550358981..f470e9b2a6 100644 --- a/build/repo.beforecommon.props +++ b/build/repo.beforecommon.props @@ -2,7 +2,7 @@ true diff --git a/build/repo.props b/build/repo.props index 5650750c00..3c7b1970a2 100644 --- a/build/repo.props +++ b/build/repo.props @@ -43,7 +43,7 @@ - + $(IntermediateDir)branding.g.props PreinstallBundledPackages;SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths - $(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts + $(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts $(RestoreDependsOn);InstallDotNet $(CompileDependsOn);BuildRepositories $(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist @@ -78,7 +78,7 @@ - + - + @@ -273,7 +273,7 @@ Condition=" @(ExternalDependency->WithMetadataValue('Version', '')->Count()) != 0 " /> - diff --git a/dockerbuild.sh b/dockerbuild.sh index d401522921..ccc55b8852 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -88,7 +88,7 @@ if ! __machine_has docker; then fi dockerfile="$DIR/build/docker/$image.Dockerfile" -tagname="universe-build-$image" +tagname="aspnetcore-build-$image" docker build "$(dirname "$dockerfile")" \ --build-arg "USER=$(whoami)" \ diff --git a/docs/Submodules.md b/docs/Submodules.md index 501e7884d3..8d24c40ff5 100644 --- a/docs/Submodules.md +++ b/docs/Submodules.md @@ -9,10 +9,10 @@ For full information, see the [official docs for git submodules](https://git-scm ## Fundamental concept -The parent repo (aspnet/Universe) stores two pieces of info about each submodule. +The parent repo (aspnet/AspNetCore) stores two pieces of info about each submodule. 1. Where to clone the submodule from. This is stored in the .gitmodules file -2. The commit hash of the submodule to use. +2. The commit hash of the submodule to use. This means you cannot commit a submodule's branch or a tag to the parent repo. Other info may appear in the .gitmodules file, but it is only used when attempting to @@ -22,7 +22,7 @@ Other info may appear in the .gitmodules file, but it is only used when attempti By default, submodules will not be present. Use `--recursive` to clone all submodules. - git clone https://github.com/aspnet/Universe.git --recursive + git clone https://github.com/aspnet/AspNetCore.git --recursive If you have already cloned, run this to initialize all submodules. @@ -53,7 +53,7 @@ Updating all submodules to newer versions can be done like this. Updating just one subumodule. git submodule update --remote modules/EntityFrameworkCore/ - + This uses the remote url and branch info configuration stored in .gitmodules to pull new commits. This does not guarantee the commit is going to be a fast-forward commit. @@ -72,7 +72,7 @@ that contains the new commit. git add modules/KestrelhttpServer/ git commit -m "Update Kestrel to latest version" -## PowerShell is slow in aspnet/Universe +## PowerShell is slow in aspnet/AspNetCore Many users have post-git, and extension that shows git status on the prompt line. Because `git status` with submodules on Windows is very slow, it can make PowerShell unbearable to use. diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1 index 5fc2ed9ee7..0cd9c331ca 100755 --- a/scripts/GenerateTags.ps1 +++ b/scripts/GenerateTags.ps1 @@ -85,12 +85,12 @@ if (-not $PSCmdlet.ShouldContinue("Continue?", "This will apply tags to all subm } -$universeTag = Get-PackageVersion $repoRoot -New-GitTag $repoRoot $universeTag -WhatIf:$WhatIfPreference +$repoTag = Get-PackageVersion $repoRoot +New-GitTag $repoRoot $repoTag -WhatIf:$WhatIfPreference $tags = @([pscustomobject] @{ repo = $(git config remote.origin.url) - tag = $universeTag + tag = $repoTag commit = $(git rev-parse HEAD) }) @@ -104,8 +104,8 @@ Get-Submodules $repoRoot | ForEach-Object { try { $tag = Get-PackageVersion $_.path - if ($tag -ne $universeTag) { - Write-Warning "${module}: version ($tag) does not match universe ($universeTag)" + if ($tag -ne $repoTag) { + Write-Warning "${module}: version ($tag) does not match repo ($repoTag)" } $tags += [pscustomobject] @{ repo = $_.remote diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 index 24b921b867..d45002e144 100755 --- a/scripts/UpdateRepos.ps1 +++ b/scripts/UpdateRepos.ps1 @@ -2,7 +2,7 @@ <# .SYNOPSIS - Updates each repo Universe builds to new dependencies.props. + Updates each submodule this repo builds to new dependencies.props. .PARAMETER Source The NuGet package source to find the lineup on. .PARAMETER LineupID @@ -71,10 +71,10 @@ try { $koreBuildLock = "korebuild-lock.txt" - $universeKoreBuildLock = (Join-Path $RepoRoot $koreBuildLock) + $repoKoreBuildLock = (Join-Path $RepoRoot $koreBuildLock) $submoduleKoreBuildLock = (Join-Path $submodule.path $koreBuildLock) - Copy-Item $universeKoreBuildLock $submoduleKoreBuildLock -Force + Copy-Item $repoKoreBuildLock $submoduleKoreBuildLock -Force Write-Verbose "About to update dependencies.props for $($submodule.module)" & .\run.ps1 upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile diff --git a/scripts/common.psm1 b/scripts/common.psm1 index 5225c6d7b8..c547cba9a9 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -161,7 +161,7 @@ function CreatePR( [string]$gitHubToken) { $hubLocation = Ensure-Hub - Invoke-Block { git push -f https://$gitHubToken@github.com/$headFork/Universe.git $destinationBranch } + Invoke-Block { git push -f https://$gitHubToken@github.com/$headFork/AspNetCore.git $destinationBranch } & $hubLocation pull-request -f -b "${baseFork}:$baseBranch" -h "${headFork}:$destinationBranch" -m $body }