Support checked-in global.json files
This commit is contained in:
parent
24e14c9870
commit
5d261e46ce
|
|
@ -19,7 +19,6 @@ node_modules/
|
||||||
.r
|
.r
|
||||||
.w
|
.w
|
||||||
.deps
|
.deps
|
||||||
global.json
|
|
||||||
msbuild.ProjectImports.zip
|
msbuild.ProjectImports.zip
|
||||||
.env
|
.env
|
||||||
scripts/tmp/
|
scripts/tmp/
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,8 @@
|
||||||
<SourceLockFile>$(RepositoryRoot)korebuild-lock.txt</SourceLockFile>
|
<SourceLockFile>$(RepositoryRoot)korebuild-lock.txt</SourceLockFile>
|
||||||
<RepoLockFile>$(BuildRepositoryRoot)korebuild-lock.txt</RepoLockFile>
|
<RepoLockFile>$(BuildRepositoryRoot)korebuild-lock.txt</RepoLockFile>
|
||||||
<BackupRepoLockFile>$(IntermediateDir)$(RepositoryToBuild)-korebuild-lock.txt</BackupRepoLockFile>
|
<BackupRepoLockFile>$(IntermediateDir)$(RepositoryToBuild)-korebuild-lock.txt</BackupRepoLockFile>
|
||||||
|
<RepoGlobalJsonFile>$(BuildRepositoryRoot)global.json</RepoGlobalJsonFile>
|
||||||
|
<BackupRepoGlobalJsonFile>$(IntermediateDir)$(RepositoryToBuild)-global.json</BackupRepoGlobalJsonFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -93,6 +95,7 @@
|
||||||
<!-- Copy Korebuild lock file to individual repos to align version if the repo doesn't already have one -->
|
<!-- 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 Universe to repository $(BuildRepositoryRoot)"/>
|
||||||
<Move SourceFiles="$(RepoLockFile)" DestinationFiles="$(BackupRepoLockFile)" Condition="Exists($(RepoLockFile))" />
|
<Move SourceFiles="$(RepoLockFile)" DestinationFiles="$(BackupRepoLockFile)" Condition="Exists($(RepoLockFile))" />
|
||||||
|
<Move SourceFiles="$(RepoGlobalJsonFile)" DestinationFiles="$(BackupRepoGlobalJsonFile)" Condition="Exists($(RepoGlobalJsonFile))" />
|
||||||
<Copy SourceFiles="$(SourceLockFile)" DestinationFiles="$(RepoLockFile)" />
|
<Copy SourceFiles="$(SourceLockFile)" DestinationFiles="$(RepoLockFile)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -100,6 +103,7 @@
|
||||||
<!-- Restore original Korebuild lock file -->
|
<!-- Restore original Korebuild lock file -->
|
||||||
<Delete Files="$(RepoLockFile)" ContinueOnError="true" />
|
<Delete Files="$(RepoLockFile)" ContinueOnError="true" />
|
||||||
<Move SourceFiles="$(BackupRepoLockFile)" DestinationFiles="$(RepoLockFile)" Condition="Exists($(BackupRepoLockFile))" />
|
<Move SourceFiles="$(BackupRepoLockFile)" DestinationFiles="$(RepoLockFile)" Condition="Exists($(BackupRepoLockFile))" />
|
||||||
|
<Move SourceFiles="$(BackupRepoGlobalJsonFile)" DestinationFiles="$(RepoGlobalJsonFile)" Condition="Exists($(BackupRepoGlobalJsonFile))" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="_BuildRepository" DependsOnTargets="GetRepoBuildProps;_UpdateRepoLockFile">
|
<Target Name="_BuildRepository" DependsOnTargets="GetRepoBuildProps;_UpdateRepoLockFile">
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"sdk": {
|
||||||
|
"version": "2.2.100-preview2-009404"
|
||||||
|
},
|
||||||
|
"msbuild-sdks": {
|
||||||
|
"Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2"
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue