Skip to content
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

Cleanups post move to net462 #3856

Merged
merged 6 commits into from
Jul 18, 2022
Merged

Cleanups post move to net462 #3856

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd7dba1
Fix TraitCollection label
Evangelink Jul 15, 2022
130ebe9
Add build var TargetNetFxVersion
Evangelink Jul 15, 2022
d94dff4
Reuse existing variables in scripts
Evangelink Jul 15, 2022
f51d90c
Fix Traits
Evangelink Jul 18, 2022
237b859
Add Directory.Build.props for new variable
Evangelink Jul 18, 2022
c1b5382
Update condition
Evangelink Jul 18, 2022
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 Traits
  • Loading branch information
@Evangelink
Evangelink committed Jul 18, 2022
commit f51d90ca013dc030973f4934cd5d1a8008465871
4 changes: 4 additions & 0 deletions src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ public class TraitCollection : IEnumerable<Trait>
internal const string TraitPropertyId = "TestObject.Traits";
private static readonly TestProperty TraitsProperty = TestProperty.Register(
TraitPropertyId,
#if !NET462
// TODO: Fix this with proper resourcing for UWP and Win 8.1 Apps
// Trying to access resources will throw "MissingManifestResourceException" percolated as "TypeInitialization" exception
"Traits",
#else
Resources.Resources.TestCasePropertyTraitsLabel,
#endif
typeof(KeyValuePair<string, string>[]),
#pragma warning disable 618
TestPropertyAttributes.Hidden | TestPropertyAttributes.Trait,
Expand Down