-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* .slnx support - use the new parser to parse .slnx files
- Loading branch information
1 parent
2358769
commit adb4394
Showing
14 changed files
with
932 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
335 changes: 258 additions & 77 deletions
335
src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs
Large diffs are not rendered by default.
Oops, something went wrong.
163 changes: 163 additions & 0 deletions
163
src/Build.UnitTests/Construction/SolutionFile_NewParser_Tests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Threading; | ||
| using Microsoft.Build.Construction; | ||
| using Microsoft.Build.Exceptions; | ||
| using Microsoft.Build.Shared; | ||
| using Microsoft.VisualStudio.SolutionPersistence; | ||
| using Microsoft.VisualStudio.SolutionPersistence.Model; | ||
| using Microsoft.VisualStudio.SolutionPersistence.Serializer; | ||
| using Shouldly; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
|
|
||
| #nullable disable | ||
|
|
||
| namespace Microsoft.Build.UnitTests.Construction | ||
| { | ||
| public class SolutionFile_NewParser_Tests | ||
| { | ||
| public ITestOutputHelper TestOutputHelper { get; } | ||
|
|
||
| public SolutionFile_NewParser_Tests(ITestOutputHelper testOutputHelper) | ||
| { | ||
| TestOutputHelper = testOutputHelper; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Tests to see that all the data/properties are correctly parsed out of a Venus | ||
| /// project in a .SLN. This can be checked only here because of AspNetConfigurations protection level. | ||
| /// </summary> | ||
| [Theory] | ||
| [InlineData(false)] | ||
| [InlineData(true)] | ||
| public void ProjectWithWebsiteProperties(bool convertToSlnx) | ||
| { | ||
| string solutionFileContents = | ||
| """ | ||
| Microsoft Visual Studio Solution File, Format Version 9.00 | ||
| # Visual Studio 2005 | ||
| Project(`{E24C65DC-7377-472B-9ABA-BC803B73C61A}`) = `C:\WebSites\WebApplication3\`, `C:\WebSites\WebApplication3\`, `{464FD0B9-E335-4677-BE1E-6B2F982F4D86}` | ||
| ProjectSection(WebsiteProperties) = preProject | ||
| ProjectReferences = `{FD705688-88D1-4C22-9BFF-86235D89C2FC}|CSCla;ssLibra;ry1.dll;{F0726D09-042B-4A7A-8A01-6BED2422BD5D}|VCClassLibrary1.dll;` | ||
| Frontpage = false | ||
| Debug.AspNetCompiler.VirtualPath = `/publishfirst` | ||
| Debug.AspNetCompiler.PhysicalPath = `..\rajeev\temp\websites\myfirstwebsite\` | ||
| Debug.AspNetCompiler.TargetPath = `..\rajeev\temp\publishfirst\` | ||
| Debug.AspNetCompiler.ForceOverwrite = `true` | ||
| Debug.AspNetCompiler.Updateable = `false` | ||
| Debug.AspNetCompiler.Debug = `true` | ||
| Debug.AspNetCompiler.KeyFile = `debugkeyfile.snk` | ||
| Debug.AspNetCompiler.KeyContainer = `12345.container` | ||
| Debug.AspNetCompiler.DelaySign = `true` | ||
| Debug.AspNetCompiler.AllowPartiallyTrustedCallers = `false` | ||
| Debug.AspNetCompiler.FixedNames = `debugfixednames` | ||
| Release.AspNetCompiler.VirtualPath = `/publishfirst_release` | ||
| Release.AspNetCompiler.PhysicalPath = `..\rajeev\temp\websites\myfirstwebsite_release\` | ||
| Release.AspNetCompiler.TargetPath = `..\rajeev\temp\publishfirst_release\` | ||
| Release.AspNetCompiler.ForceOverwrite = `true` | ||
| Release.AspNetCompiler.Updateable = `true` | ||
| Release.AspNetCompiler.Debug = `false` | ||
| VWDPort = 63496 | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|.NET = Debug|.NET | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {464FD0B9-E335-4677-BE1E-6B2F982F4D86}.Debug|.NET.ActiveCfg = Debug|.NET | ||
| {464FD0B9-E335-4677-BE1E-6B2F982F4D86}.Debug|.NET.Build.0 = Debug|.NET | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal | ||
| """; | ||
|
|
||
| SolutionFile solution = ParseSolutionHelper(solutionFileContents.Replace('`', '"'), convertToSlnx); | ||
|
|
||
| solution.ProjectsInOrder.ShouldHaveSingleItem(); | ||
|
|
||
| solution.ProjectsInOrder[0].ProjectType.ShouldBe(SolutionProjectType.WebProject); | ||
| solution.ProjectsInOrder[0].ProjectName.ShouldBe(@"C:\WebSites\WebApplication3\"); | ||
| solution.ProjectsInOrder[0].RelativePath.ShouldBe(ConvertToUnixPathIfNeeded(@"C:\WebSites\WebApplication3\")); | ||
| solution.ProjectsInOrder[0].Dependencies.Count.ShouldBe(2); | ||
| solution.ProjectsInOrder[0].ParentProjectGuid.ShouldBeNull(); | ||
| solution.ProjectsInOrder[0].GetUniqueProjectName().ShouldBe(@"C:\WebSites\WebApplication3\"); | ||
|
|
||
| Hashtable aspNetCompilerParameters = solution.ProjectsInOrder[0].AspNetConfigurations; | ||
| AspNetCompilerParameters debugAspNetCompilerParameters = (AspNetCompilerParameters)aspNetCompilerParameters["Debug"]; | ||
| AspNetCompilerParameters releaseAspNetCompilerParameters = (AspNetCompilerParameters)aspNetCompilerParameters["Release"]; | ||
|
|
||
| debugAspNetCompilerParameters.aspNetVirtualPath.ShouldBe(@"/publishfirst"); | ||
| debugAspNetCompilerParameters.aspNetPhysicalPath.ShouldBe(@"..\rajeev\temp\websites\myfirstwebsite\"); | ||
| debugAspNetCompilerParameters.aspNetTargetPath.ShouldBe(@"..\rajeev\temp\publishfirst\"); | ||
| debugAspNetCompilerParameters.aspNetForce.ShouldBe(@"true"); | ||
| debugAspNetCompilerParameters.aspNetUpdateable.ShouldBe(@"false"); | ||
| debugAspNetCompilerParameters.aspNetDebug.ShouldBe(@"true"); | ||
| debugAspNetCompilerParameters.aspNetKeyFile.ShouldBe(@"debugkeyfile.snk"); | ||
| debugAspNetCompilerParameters.aspNetKeyContainer.ShouldBe(@"12345.container"); | ||
| debugAspNetCompilerParameters.aspNetDelaySign.ShouldBe(@"true"); | ||
| debugAspNetCompilerParameters.aspNetAPTCA.ShouldBe(@"false"); | ||
| debugAspNetCompilerParameters.aspNetFixedNames.ShouldBe(@"debugfixednames"); | ||
|
|
||
| releaseAspNetCompilerParameters.aspNetVirtualPath.ShouldBe(@"/publishfirst_release"); | ||
| releaseAspNetCompilerParameters.aspNetPhysicalPath.ShouldBe(@"..\rajeev\temp\websites\myfirstwebsite_release\"); | ||
| releaseAspNetCompilerParameters.aspNetTargetPath.ShouldBe(@"..\rajeev\temp\publishfirst_release\"); | ||
| releaseAspNetCompilerParameters.aspNetForce.ShouldBe(@"true"); | ||
| releaseAspNetCompilerParameters.aspNetUpdateable.ShouldBe(@"true"); | ||
| releaseAspNetCompilerParameters.aspNetDebug.ShouldBe(@"false"); | ||
| releaseAspNetCompilerParameters.aspNetKeyFile.ShouldBe(""); | ||
| releaseAspNetCompilerParameters.aspNetKeyContainer.ShouldBe(""); | ||
| releaseAspNetCompilerParameters.aspNetDelaySign.ShouldBe(""); | ||
| releaseAspNetCompilerParameters.aspNetAPTCA.ShouldBe(""); | ||
| releaseAspNetCompilerParameters.aspNetFixedNames.ShouldBe(""); | ||
|
|
||
| List<string> aspNetProjectReferences = solution.ProjectsInOrder[0].ProjectReferences; | ||
| aspNetProjectReferences.Count.ShouldBe(2); | ||
| aspNetProjectReferences[0].ShouldBe("{FD705688-88D1-4C22-9BFF-86235D89C2FC}"); | ||
| aspNetProjectReferences[1].ShouldBe("{F0726D09-042B-4A7A-8A01-6BED2422BD5D}"); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Helper method to create a SolutionFile object, and call it to parse the SLN file | ||
| /// represented by the string contents passed in. Optionally can convert the SLN to SLNX and then parse the solution. | ||
| /// </summary> | ||
| internal static SolutionFile ParseSolutionHelper(string solutionFileContents, bool convertToSlnx = false) | ||
| { | ||
| solutionFileContents = solutionFileContents.Replace('\'', '"'); | ||
|
|
||
| using (TestEnvironment testEnvironment = TestEnvironment.Create()) | ||
| { | ||
| TransientTestFile sln = testEnvironment.CreateFile(FileUtilities.GetTemporaryFileName(".sln"), solutionFileContents); | ||
|
|
||
| string solutionPath = convertToSlnx ? ConvertToSlnx(sln.Path) : sln.Path; | ||
|
|
||
| SolutionFile solutionFile = new SolutionFile { FullPath = solutionPath }; | ||
| solutionFile.ParseUsingNewParser(); | ||
| return solutionFile; | ||
| } | ||
| } | ||
|
|
||
| private static string ConvertToSlnx(string slnPath) | ||
| { | ||
| string slnxPath = slnPath + "x"; | ||
| ISolutionSerializer serializer = SolutionSerializers.GetSerializerByMoniker(slnPath).ShouldNotBeNull(); | ||
| SolutionModel solutionModel = serializer.OpenAsync(slnPath, CancellationToken.None).Result; | ||
| SolutionSerializers.SlnXml.SaveAsync(slnxPath, solutionModel, CancellationToken.None).Wait(); | ||
| return slnxPath; | ||
| } | ||
|
|
||
| private static string ConvertToUnixPathIfNeeded(string path) | ||
| { | ||
| // In the new parser, ProjectModel.FilePath is converted to Unix-style. | ||
| return !NativeMethodsShared.IsWindows ? path.Replace('\\', '/') : path; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.