提交 7250fc2c 编写于 作者: A Andy Gocke

Use Dependencies.props to find ref assemblies

上级 da5ba752
......@@ -31,6 +31,7 @@
<MicrosoftVisualStudioInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioInteractiveWindowVersion>
<MicrosoftVisualStudioVsInteractiveWindowVersion>2.0.0-rc3-61304-01</MicrosoftVisualStudioVsInteractiveWindowVersion>
<MicrosoftVSSDKBuildToolsVersion>15.0.26124-RC3</MicrosoftVSSDKBuildToolsVersion>
<NETStandardLibraryVersion>2.0.0-beta-25123-01</NETStandardLibraryVersion>
<RoslynToolsMicrosoftLocateVSVersion>0.2.4-beta</RoslynToolsMicrosoftLocateVSVersion>
<RoslynToolsMicrosoftSignToolVersion>0.3.0-beta</RoslynToolsMicrosoftSignToolVersion>
<RoslynToolsMicrosoftVSIXExpInstallerVersion>0.2.4-beta</RoslynToolsMicrosoftVSIXExpInstallerVersion>
......@@ -99,11 +100,10 @@
<SystemXmlReaderWriterVersion>4.3.0</SystemXmlReaderWriterVersion>
<SystemXmlXDocumentVersion>4.3.0</SystemXmlXDocumentVersion>
<SystemXmlXmlDocumentVersion>4.3.0</SystemXmlXmlDocumentVersion>
<SystemXmlXmlSerializerVersion>4.3.0</SystemXmlXmlSerializerVersion>
<SystemXmlXPathXDocumentVersion>4.3.0</SystemXmlXPathXDocumentVersion>
<xunitVersion>2.2.0-beta4-build3444</xunitVersion>
<xunitconsolenetcoreVersion>1.0.2-prerelease-00104</xunitconsolenetcoreVersion>
<xunitrunnerconsoleVersion>2.2.0-beta4-build3444</xunitrunnerconsoleVersion>
<xunitrunnervisualstudioVersion>2.2.0-beta4-build1194</xunitrunnervisualstudioVersion>
</PropertyGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -31,10 +31,7 @@
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RepoRoot)Binaries\Obj\</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
<NetStandard20LibraryVersion>2.0.0-beta-25123-01</NetStandard20LibraryVersion>
<NetStandard20RefPath>$(NuGetPackageRoot)/NETStandard.Library/$(NetStandard20LibraryVersion)/build/netstandard2.0/ref/</NetStandard20RefPath>
<MicrosoftCSharpVersion>4.3.0</MicrosoftCSharpVersion>
<NetStandard20RefPath>$(NuGetPackageRoot)/NETStandard.Library/$(NETStandardLibraryVersion)/build/netstandard2.0/ref/</NetStandard20RefPath>
<MicrosoftCSharpRefPath>$(NuGetPackageRoot)/Microsoft.CSharp/$(MicrosoftCSharpVersion)/ref/netstandard1.0/</MicrosoftCSharpRefPath>
<!-- Workaround until we move to Microsoft.Net.Compilers.nupkg with this fix: https://github.com/dotnet/roslyn/commit/05c12ebfcdd08a02dbceded5327a8da7a7df23be:
......
......@@ -48,7 +48,8 @@
"^Microsoft.?Build.*",
"GitLink",
"Microsoft.NETCore.Runtime.CoreCLR",
"Microsoft.VSSDK.BuildTools"
"Microsoft.VSSDK.BuildTools",
"NETStandard.Library"
]
}
},
......@@ -60,5 +61,10 @@
"^src\\\\Dependencies.*",
".*NuSpec.loc.*",
".*Templates.*"
],
"projectJsonExcludes": [
"^build\\\\MSBuildToolset.*",
"^src\\\\Tools\\\\Source\\\\CompilerGeneratorTools.*"
]
}
......@@ -83,12 +83,13 @@ internal static RepoData Create(RepoConfig config, string sourcesDir, out List<N
var floatingPackageMap = new Dictionary<string, NuGetPackageSource>(Constants.NugetPackageNameComparer);
foreach (var filePath in ProjectJsonUtil.GetProjectJsonFiles(sourcesDir))
{
if (config.ProjectJsonExcludes.Any(x => x.IsMatch(filePath)))
var fileName = FileName.FromFullPath(sourcesDir, filePath);
if (config.ProjectJsonExcludes.Any(x => x.IsMatch(fileName.RelativePath)))
{
continue;
}
var fileName = FileName.FromFullPath(sourcesDir, filePath);
foreach (var package in ProjectJsonUtil.GetDependencies(filePath))
{
if (fixedPackageSet.Contains(package))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册