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

delete tfm constants #79219

Merged
merged 1 commit into from
Dec 5, 2022
Merged

delete tfm constants #79219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void FrameworkHiveSelection_CurrentDirectoryIsIgnored()
{
RunTest(new TestSettings()
.WithRuntimeConfigCustomizer(runtimeConfig => runtimeConfig
.WithTfm(Constants.Tfm.Net6)
.WithTfm("net6.0")
.WithFramework(MicrosoftNETCoreApp, "5.0.0"))
.WithWorkingDirectory(SharedState.DotNetCurrentHive.BinPath),
multiLevelLookup: true)
Expand Down
8 changes: 0 additions & 8 deletions src/installer/tests/TestUtils/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ public static class RollForwardSetting
public const string Disable = "Disable";
}

public static class Tfm
{
public const string RuntimeConfigPropertyName = "tfm";
public const string Net6 = "net6.0";
public const string Net7 = "net7.0";
public const string Net8 = "net8.0";
}

public static class FxVersion
{
public const string CommandLineArgument = "--fx-version";
Expand Down
4 changes: 1 addition & 3 deletions src/installer/tests/TestUtils/RuntimeConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@ public void Save()

if (_tfm is not null)
{
runtimeOptions.Add(
Constants.Tfm.RuntimeConfigPropertyName,
_tfm);
runtimeOptions.Add("tfm", _tfm);
}

if (_properties.Count > 0)
Expand Down
23 changes: 0 additions & 23 deletions ...s/Microsoft.Extensions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Common/Tfm.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ons.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/ApplicationDeployer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private void ValidateParameters()

private RuntimeFlavor GetRuntimeFlavor(string tfm)
{
if (Tfm.Matches(Tfm.Net462, tfm))
if (tfm.ToLowerInvariant() == "net462")
{
return RuntimeFlavor.Clr;
}
Expand Down
3 changes: 2 additions & 1 deletion ...nsions.Hosting/tests/FunctionalTests/IntegrationTesting/src/Deployers/SelfHostDeployer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ protected async Task<CancellationToken> StartSelfHostAsync()
{
// Core+Standalone always publishes. This must be Clr+Standalone or Core+Portable.
// Run from the pre-built bin/{config}/{tfm} directory.
Version version = Environment.Version;
var targetFramework = DeploymentParameters.TargetFramework
?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? Tfm.Net462 : Tfm.NetCoreApp22);
?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net462" : $"net{version.Major}.{version.Minor}");
workingDirectory = Path.Combine(DeploymentParameters.ApplicationPath, "bin", DeploymentParameters.Configuration, targetFramework);
// CurrentDirectory will point to bin/{config}/{tfm}, but the config and static files aren't copied, point to the app base instead.
DeploymentParameters.EnvironmentVariables["DOTNET_CONTENTROOT"] = DeploymentParameters.ApplicationPath;
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/Microsoft.Extensions.Hosting/tests/FunctionalTests/ShutdownTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@ private async Task ExecuteShutdownTest(string testName, string shutdownMechanic)
var applicationPath = string.Empty; // disabled for now
#pragma warning restore 0618

Version version = Environment.Version;
var deploymentParameters = new DeploymentParameters(
applicationPath,
RuntimeFlavor.CoreClr,
RuntimeArchitecture.x64)
{
TargetFramework = Tfm.NetCoreApp50,
TargetFramework = $"Environment{version.Major}.{version.Minor}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kasperk81 Shouldn't this read $"net{version.Major}.{version.Minor}" (or null)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ooops, #79230. thanks for catching it

ApplicationType = ApplicationType.Portable,
PublishApplicationBeforeDeployment = true,
StatusMessagesEnabled = false
Expand Down