Skip to content

Add support for new output path format #31454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsplaisted merged 32 commits into from
Mar 31, 2023
Merged

Add support for new output path format #31454

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9b2a21c
Support artifacts output format
dsplaisted Dec 16, 2022
deb72ce
Update tests for artifacts output format
dsplaisted Dec 16, 2022
6c2ccc7
Update publish tests for new output path format
dsplaisted Jan 6, 2023
967c5c8
Revert removing TargetFramework from calls to GetOutputDirectory
dsplaisted Jan 6, 2023
f8defcb
Fix package output path, don't check if TargetFramework is a global p…
dsplaisted Jan 10, 2023
a303e46
Fix handling of RuntimeIdentifier for blazor wasm and artifacts output
dsplaisted Jan 11, 2023
1b10d4c
Fix tests
dsplaisted Jan 11, 2023
52287bb
Update blazor wasm baselines
dsplaisted Jan 11, 2023
3c56e27
Update tests
dsplaisted Jan 11, 2023
cc0cbfc
Update tests
dsplaisted Jan 12, 2023
e3c18e4
Fix tests
dsplaisted Jan 12, 2023
caa24c4
Fix test
dsplaisted Jan 12, 2023
aeb1caa
Switch from artifacts to bin folder for new format, rename properties
dsplaisted Jan 27, 2023
14d554d
Add support for RootOutputPath
dsplaisted Jan 27, 2023
ea679fa
Don't default to standard output paths based on target framework
dsplaisted Jan 27, 2023
8eb2f36
Revert blazor wasm baseline update
dsplaisted Jan 31, 2023
73d8d6a
Fix tests
dsplaisted Jan 31, 2023
53cc787
Fix tests
dsplaisted Jan 31, 2023
e772177
Fix path casing in test
dsplaisted Jan 31, 2023
498f932
Update to latest version of output path design proposal
dsplaisted Feb 24, 2023
6838534
Update Artifacts output tests
dsplaisted Feb 28, 2023
581a780
Fix test code null reference
dsplaisted Feb 28, 2023
57da37a
Fix test issues
dsplaisted Mar 1, 2023
c747974
Fix tests
dsplaisted Mar 1, 2023
51265a5
Fix publish path calculation for tests
dsplaisted Mar 1, 2023
11d5b6e
Implement rest of design, fix bugs, add tests
dsplaisted Mar 9, 2023
ab17774
Apply feedback, fix bugs, add test
dsplaisted Mar 9, 2023
5595c27
Remove duplication in ArtifactsPath logic
dsplaisted Mar 24, 2023
3816470
Add telemetry for how artifacts paths are used
dsplaisted Mar 24, 2023
b9b67fb
Update telemetry tests
dsplaisted Mar 24, 2023
b07548f
Consolidate TestSolution with TestAssetsManager.CreateTestProjects
dsplaisted Mar 30, 2023
c2d6049
Merge upstream changes
dsplaisted Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test issues
  • Loading branch information
@dsplaisted
dsplaisted committed Mar 23, 2023
commit 57da37a3f4bf317691f442d96e1c656ffd87f02c
14 changes: 7 additions & 7 deletions src/Tests/Microsoft.NET.TestFramework/OutputPathCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static OutputPathCalculator FromProject(string projectPath, TestProject t
var project = XDocument.Load(projectPath);
var ns = project.Root.Name.Namespace;

var useArtifactsOutputElement = project.Root.Elements(ns + "PropertyGroup").Elements("UseArtifactsOutput").FirstOrDefault();
var useArtifactsOutputElement = project.Root.Elements(ns + "PropertyGroup").Elements(ns + "UseArtifactsOutput").FirstOrDefault();
if (useArtifactsOutputElement != null)
{
calculator.UseArtifactsOutput = bool.Parse(useArtifactsOutputElement.Value);
Expand All @@ -93,13 +93,13 @@ public static OutputPathCalculator FromProject(string projectPath, TestProject t
}
}

var targetFrameworkElement = project.Root.Elements(ns + "PropertyGroup").Elements("TargetFramework").FirstOrDefault();
var targetFrameworkElement = project.Root.Elements(ns + "PropertyGroup").Elements(ns + "TargetFramework").FirstOrDefault();
if (targetFrameworkElement != null)
{
calculator.TargetFramework = targetFrameworkElement.Value;
}

var targetFrameworksElement = project.Root.Elements(ns + "PropertyGroup").Elements("TargetFrameworks").FirstOrDefault();
var targetFrameworksElement = project.Root.Elements(ns + "PropertyGroup").Elements(ns + "TargetFrameworks").FirstOrDefault();
if (targetFrameworksElement != null)
{
calculator.TargetFrameworks = targetFrameworksElement.Value;
Expand All @@ -117,7 +117,7 @@ public static OutputPathCalculator FromProject(string projectPath, TestProject t
var dbp = XDocument.Load(directoryBuildPropsFile);
var dbpns = dbp.Root.Name.Namespace;

var dbpUsesArtifacts = dbp.Root.Elements(ns + "PropertyGroup").Elements("UseArtifactsOutput").FirstOrDefault();
var dbpUsesArtifacts = dbp.Root.Elements(dbpns + "PropertyGroup").Elements(dbpns + "UseArtifactsOutput").FirstOrDefault();
if (dbpUsesArtifacts != null)
{

Expand Down Expand Up @@ -183,7 +183,7 @@ public string GetOutputDirectory(string targetFramework = null, string configura
}
else
{
targetFramework = targetFramework ?? TargetFramework;
targetFramework = targetFramework ?? TargetFramework ?? string.Empty;
configuration = configuration ?? string.Empty;
runtimeIdentifier = runtimeIdentifier ?? RuntimeIdentifier ?? string.Empty;

Expand Down Expand Up @@ -229,7 +229,7 @@ public string GetPublishDirectory(string targetFramework = null, string configur
}
else
{
targetFramework = targetFramework ?? TargetFramework;
targetFramework = targetFramework ?? TargetFramework ?? string.Empty;
configuration = configuration ?? string.Empty;
runtimeIdentifier = runtimeIdentifier ?? RuntimeIdentifier ?? string.Empty;

Expand Down Expand Up @@ -259,7 +259,7 @@ public string GetIntermediateDirectory(string targetFramework = null, string con
return Path.Combine(ArtifactsPath, "obj", Path.GetFileNameWithoutExtension(ProjectPath), pivot);
}

targetFramework = targetFramework ?? TargetFramework;
targetFramework = targetFramework ?? TargetFramework ?? string.Empty;
configuration = configuration ?? string.Empty;
runtimeIdentifier = runtimeIdentifier ?? RuntimeIdentifier ?? string.Empty;

Expand Down