Browse Source

React to renaming this repo from Universe to AspNetCore

Nate McMaster 7 years ago
parent
commit
c2e4a74f7d

+ 1 - 1
.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:

+ 1 - 1
Directory.Build.props

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Product>Microsoft ASP.NET Core</Product>
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    <RepositoryUrl>https://github.com/aspnet/Universe</RepositoryUrl>
+    <RepositoryUrl>https://github.com/aspnet/AspNetCore</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

+ 3 - 3
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
 ```
 

+ 1 - 1
build/PackageArchive.targets

@@ -1,5 +1,5 @@
 <Project>
-  <Target Name="CheckForPreviousReleaseArchiveBaseline" BeforeTargets="CheckUniverse">
+  <Target Name="CheckForPreviousReleaseArchiveBaseline" BeforeTargets="FastCheck">
     <MSBuild Projects="@(ArchiveProjects)"
              Targets="CheckForPreviousReleaseArchiveBaseline" />
   </Target>

+ 1 - 1
build/RepositoryBuild.targets

@@ -96,7 +96,7 @@
 
   <Target Name="_UpdateRepoLockFile">
     <!-- Copy Korebuild lock file to individual repos to align version if the repo doesn't already have one -->
-    <Message Text="Copying KoreBuild lockfile from Universe to repository $(BuildRepositoryRoot)"/>
+    <Message Text="Copying KoreBuild lockfile from repo to submodule $(BuildRepositoryRoot)"/>
     <Move SourceFiles="$(RepoLockFile)" DestinationFiles="$(BackupRepoLockFile)" Condition="Exists($(RepoLockFile))" />
     <Copy SourceFiles="$(SourceLockFile)" DestinationFiles="$(RepoLockFile)" />
   </Target>

+ 1 - 1
build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec

@@ -4,7 +4,7 @@
     <id>Internal.AspNetCore.Universe.Lineup</id>
     <version>$version$</version>
     <authors>Microsoft</authors>
-    <description>This package used to unify ASP.NET Core package versions across all Universe repos. Internal use only.</description>
+    <description>This package used to unify ASP.NET Core package versions across all ASP.NET Core repos. Internal use only.</description>
     <packageTypes>
       <packageType name="lineup" />
     </packageTypes>

+ 1 - 1
build/repo.beforecommon.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!--
         This ensures the build number is a time-based number for local builds.
-        This is important for local builds of Universe which need to ensure repo-to-repo
+        This is important for local builds of ASP.NET Core which need to ensure repo-to-repo
         builds are using new articacts, not ones from the global cache.
     -->
     <IncrementalVersion>true</IncrementalVersion>

+ 1 - 1
build/repo.props

@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe -->
+    <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by ASP.NET Core -->
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" />
 
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"

+ 4 - 4
build/repo.targets

@@ -16,7 +16,7 @@
     <GeneratedBrandingPropsPath>$(IntermediateDir)branding.g.props</GeneratedBrandingPropsPath>
 
     <PrepareDependsOn>PreinstallBundledPackages;SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths</PrepareDependsOn>
-    <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
+    <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts</CleanDependsOn>
     <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet</RestoreDependsOn>
     <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
     <PackageDependsOn Condition="'$(TestOnly)' != 'true'">$(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist</PackageDependsOn>
@@ -78,7 +78,7 @@
       <PackageArtifact Remove="@(PackageArtifact)" />
     </ItemGroup>
 
-    <!-- Join required because shipping category is stored in universe (PackageArtifact), but information about package ID and version comes from repos (ArtifactInfo). -->
+    <!-- Join required because shipping category is stored in artifact.props (PackageArtifact), but information about package ID and version comes from repos (ArtifactInfo). -->
     <RepoTasks.JoinItems
       Left="@(_Temp)"
       LeftMetadata="*"
@@ -179,7 +179,7 @@
     </PackNuSpec>
   </Target>
 
-  <Target Name="CleanUniverseArtifacts">
+  <Target Name="CleanRepoArtifacts">
     <RemoveDir Directories="$(RepositoryRoot)obj" Condition="Exists('$(RepositoryRoot)obj')" />
   </Target>
 
@@ -273,7 +273,7 @@
            Condition=" @(ExternalDependency->WithMetadataValue('Version', '')->Count()) != 0 " />
   </Target>
 
-  <Target Name="CheckUniverse"
+  <Target Name="FastCheck"
     DependsOnTargets="ComputeGraph;VerifyPackageArtifactConfig;VerifyAllReposHaveNuGetPackageVerifier" />
 
   <Target Name="CheckExpectedPackagesExist">

+ 1 - 1
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)" \

+ 5 - 5
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.

+ 5 - 5
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

+ 3 - 3
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

+ 1 - 1
scripts/common.psm1

@@ -161,7 +161,7 @@ function CreatePR(
     [string]$gitHubToken) {
     $hubLocation = Ensure-Hub
 
-    Invoke-Block { git push -f https://[email protected]/$headFork/Universe.git $destinationBranch }
+    Invoke-Block { git push -f https://[email protected]/$headFork/AspNetCore.git $destinationBranch }
     & $hubLocation pull-request -f -b "${baseFork}:$baseBranch" -h "${headFork}:$destinationBranch" -m $body
 }