huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove workarounds

This commit is contained in:
Nate McMaster 2017-02-09 14:30:27 -08:00
parent 9ff20f8340
commit 6eca0806af
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/ci-test.common.props
View File

@ -1,7 +0,0 @@
<!-- KoreBuild can discover this file is renamed to universe.props-->
<Project ToolsVersion="15.0">
<PropertyGroup>
<!-- VS 2017 aware-packages can use this env variable to swap ProjectReference for PackageReference -->
<TestFromPackages>true</TestFromPackages>
</PropertyGroup>
</Project>

7
graph.proj
View File

@ -1,7 +0,0 @@
<!-- workaround https://github.com/Microsoft/msbuild/issues/1587 -->
<Project>
<ItemGroup>
<RestoreGraphProjectInputItems Include="$(RepoDir)\**\*.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\NuGet.targets" />
</Project>

6
makefile.shade
View File

@ -777,6 +777,7 @@ functions
{ {
IEnumerable<string> reposToBuild = new HashSet<string>(StringComparer.OrdinalIgnoreCase) IEnumerable<string> reposToBuild = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{ {
"Microsoft.Data.Sqlite",
"PlatformAbstractions", "PlatformAbstractions",
"Common", "Common",
"JsonPatch", "JsonPatch",
@ -791,7 +792,6 @@ functions
"DataProtection", "DataProtection",
"HttpAbstractions", "HttpAbstractions",
"Testing", "Testing",
"Microsoft.Data.Sqlite",
"Caching", "Caching",
"Razor", "Razor",
"Hosting", "Hosting",
@ -1041,6 +1041,7 @@ functions
private static void ResolveMsBuildProjects(RepositoryInfo info, string repo) private static void ResolveMsBuildProjects(RepositoryInfo info, string repo)
{ {
Console.WriteLine("Resolving projects from " + repo);
var solutions = Directory.EnumerateFiles(repo, "*.sln") var solutions = Directory.EnumerateFiles(repo, "*.sln")
.Select(MsBuildSolutionInfo.LoadFromFile) .Select(MsBuildSolutionInfo.LoadFromFile)
.Where(sln => sln.IsVs2017); .Where(sln => sln.IsVs2017);
@ -1060,8 +1061,7 @@ functions
{ {
UseShellExecute = false, UseShellExecute = false,
FileName = "dotnet", FileName = "dotnet",
// TODO revert to invoking on .sln file when https://github.com/Microsoft/msbuild/issues/1587 is resolve Arguments = "msbuild \"" + solution.FilePath + "\" /v:q /nologo /t:GenerateRestoreGraphFile \"/p:RestoreGraphOutputPath=" + dgJson + "\""
Arguments = "msbuild \"" + Path.Combine(Directory.GetCurrentDirectory(), "graph.proj") + "\" /v:q /p:WarningLevel=0 /p:RepoDir=\"" + solution.Directory + "\" /nologo /t:GenerateRestoreGraphFile \"/p:RestoreGraphOutputPath=" + dgJson + "\""
}; };
var p = Process.Start(psi); var p = Process.Start(psi);
p.WaitForExit(); p.WaitForExit();