Browse Source

Support checked-in global.json files

Nate McMaster 7 years ago
parent
commit
5d261e46ce
3 changed files with 12 additions and 1 deletions
  1. 0 1
      .gitignore
  2. 4 0
      build/RepositoryBuild.targets
  3. 8 0
      global.json

+ 0 - 1
.gitignore

@@ -19,7 +19,6 @@ node_modules/
 .r
 .w
 .deps
-global.json
 msbuild.ProjectImports.zip
 .env
 scripts/tmp/

+ 4 - 0
build/RepositoryBuild.targets

@@ -86,6 +86,8 @@
       <SourceLockFile>$(RepositoryRoot)korebuild-lock.txt</SourceLockFile>
       <RepoLockFile>$(BuildRepositoryRoot)korebuild-lock.txt</RepoLockFile>
       <BackupRepoLockFile>$(IntermediateDir)$(RepositoryToBuild)-korebuild-lock.txt</BackupRepoLockFile>
+      <RepoGlobalJsonFile>$(BuildRepositoryRoot)global.json</RepoGlobalJsonFile>
+      <BackupRepoGlobalJsonFile>$(IntermediateDir)$(RepositoryToBuild)-global.json</BackupRepoGlobalJsonFile>
     </PropertyGroup>
   </Target>
 
@@ -93,6 +95,7 @@
     <!-- 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)"/>
     <Move SourceFiles="$(RepoLockFile)" DestinationFiles="$(BackupRepoLockFile)" Condition="Exists($(RepoLockFile))" />
+    <Move SourceFiles="$(RepoGlobalJsonFile)" DestinationFiles="$(BackupRepoGlobalJsonFile)" Condition="Exists($(RepoGlobalJsonFile))" />
     <Copy SourceFiles="$(SourceLockFile)" DestinationFiles="$(RepoLockFile)" />
   </Target>
 
@@ -100,6 +103,7 @@
     <!-- Restore original Korebuild lock file -->
     <Delete Files="$(RepoLockFile)" ContinueOnError="true" />
     <Move SourceFiles="$(BackupRepoLockFile)" DestinationFiles="$(RepoLockFile)" Condition="Exists($(BackupRepoLockFile))"  />
+    <Move SourceFiles="$(BackupRepoGlobalJsonFile)" DestinationFiles="$(RepoGlobalJsonFile)" Condition="Exists($(BackupRepoGlobalJsonFile))"  />
   </Target>
 
   <Target Name="_BuildRepository" DependsOnTargets="GetRepoBuildProps;_UpdateRepoLockFile">

+ 8 - 0
global.json

@@ -0,0 +1,8 @@
+{
+    "sdk": {
+        "version": "2.2.100-preview2-009404"
+    },
+    "msbuild-sdks": {
+        "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2"
+    }
+}