-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Add support for file-based apps to dotnet-ef tools #38157
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.
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0f8ad42
Add support for file-based apps to dotnet-ef tools
jjonescz 74f06dc
Make test verbose
jjonescz 85af027
Use .NET 10 in test
jjonescz 5ac7d90
Improve tests
jjonescz ffaaa26
Just use build
jjonescz 4794a7a
Restore formatting
jjonescz 6fa98a4
Remove file option
jjonescz fe15fd4
Clarify resource strings
jjonescz 94390d5
Improve tests
jjonescz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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,95 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| namespace Microsoft.EntityFrameworkCore.Tools; | ||
|
|
||
| public sealed class ProjectTest(ITestOutputHelper output) | ||
| { | ||
| private const string TargetFramework = "net10.0"; | ||
|
|
||
| [Fact] | ||
| public void Csproj_metadata_can_be_extracted() | ||
| { | ||
| using var directory = new TempDirectory(); | ||
| var csprojFile = Path.Combine(directory.Path, "MyApp.csproj"); | ||
| File.WriteAllText(csprojFile, $""" | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>{TargetFramework}</TargetFramework> | ||
| </PropertyGroup> | ||
| </Project> | ||
| """); | ||
|
|
||
| Exe.Run("dotnet", ["restore", csprojFile], handleOutput: _ => { }); | ||
|
|
||
| var project = Project.FromFile(csprojFile); | ||
|
|
||
| Assert.Equal("C#", project.Language); | ||
| Assert.Equal("MyApp", project.AssemblyName); | ||
| Assert.Equal(TargetFramework, project.TargetFramework); | ||
| Assert.NotNull(project.OutputPath); | ||
| Assert.NotNull(project.ProjectDir); | ||
| Assert.Equal("MyApp.dll", project.TargetFileName); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void File_based_app_can_be_built() | ||
| { | ||
| WithVerboseOutput(() => | ||
| { | ||
| using var directory = new TempDirectory(); | ||
| var csFile = Path.Combine(directory.Path, "MyApp.cs"); | ||
| File.WriteAllText(csFile, $""" | ||
| #:property TargetFramework={TargetFramework} | ||
| Console.WriteLine("Hello"); | ||
| """); | ||
|
|
||
| Exe.Run("dotnet", ["restore", csFile], handleOutput: Reporter.WriteVerbose); | ||
|
jjonescz marked this conversation as resolved.
|
||
|
|
||
| var project = Project.FromFile(csFile); | ||
|
|
||
| Assert.Equal("C#", project.Language); | ||
| Assert.Equal("MyApp", project.AssemblyName); | ||
| Assert.Equal(TargetFramework, project.TargetFramework); | ||
| Assert.NotNull(project.OutputPath); | ||
| Assert.NotNull(project.ProjectDir); | ||
| Assert.NotNull(project.TargetFileName); | ||
|
|
||
| project.Build(additionalArgs: null); | ||
|
|
||
| var targetDir = Path.GetFullPath(Path.Combine(project.ProjectDir!, project.OutputPath!)); | ||
| var targetPath = Path.Combine(targetDir, project.TargetFileName!); | ||
| Assert.True(File.Exists(targetPath), $"Expected build output at {targetPath}"); | ||
| }); | ||
| } | ||
|
|
||
| private void WithVerboseOutput(Action action) | ||
| { | ||
| var previousIsVerbose = Reporter.IsVerbose; | ||
| var previousPrefixOutput = Reporter.PrefixOutput; | ||
| Reporter.IsVerbose = true; | ||
| Reporter.PrefixOutput = true; | ||
| Reporter.SetStdOut(new TestOutputWriter(output)); | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| finally | ||
| { | ||
| Reporter.IsVerbose = previousIsVerbose; | ||
| Reporter.PrefixOutput = previousPrefixOutput; | ||
| Reporter.SetStdOut(Console.Out); | ||
| } | ||
| } | ||
|
|
||
| private sealed class TestOutputWriter(ITestOutputHelper output) : StringWriter | ||
| { | ||
| public override void WriteLine(string? value) | ||
| { | ||
| if (value != null) | ||
| { | ||
| output.WriteLine(value); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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,23 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| namespace Microsoft.EntityFrameworkCore.Tools; | ||
|
|
||
| internal class TempDirectory : IDisposable | ||
| { | ||
| public TempDirectory() | ||
| { | ||
| Path = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetRandomFileName()); | ||
| Directory.CreateDirectory(Path); | ||
| } | ||
|
|
||
| public string Path { get; } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| if (Directory.Exists(Path)) | ||
| { | ||
| Directory.Delete(Path, recursive: true); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.