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

[main] Update dependencies from dotnet/razor #46184

Merged
merged 8 commits into from
Jan 24, 2025
Merged

[main] Update dependencies from dotnet/razor #46184

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06dc4a3
Update dependencies from https://github.com/dotnet/razor build 202501…
dotnet-maestro[bot] Jan 21, 2025
732b444
Update dependencies from https://github.com/dotnet/razor build 202501…
dotnet-maestro[bot] Jan 22, 2025
a3ebb57
Update to account for RazorCSharpDocument API change
DustinCampbell Jan 21, 2025
ee51a3a
Update dependencies from https://github.com/dotnet/razor build 202501…
dotnet-maestro[bot] Jan 22, 2025
a7801ea
Update dependencies from https://github.com/dotnet/razor build 202501…
dotnet-maestro[bot] Jan 23, 2025
8d201f4
Merge branch 'main' into darc-main-f938254a-0ecc-4fb9-89d7-4c1456551c0e
lewing Jan 23, 2025
d3c1684
Don't disable the OOB compiler package when building razor
ViktorHofer Jan 23, 2025
858dff8
Update dependencies from https://github.com/dotnet/razor build 202501…
dotnet-maestro[bot] Jan 24, 2025
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,22 +366,22 @@
<Sha>aa38ac354da344c4b567210f3f37c3ff2e674c9c</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25070.1">
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25072.3">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>66fdab134fb3e72d0fc265fd4456fefd405cf07f</Sha>
<Sha>4b6227bb3f6d9161b320d22ea1a82fc78821f278</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25070.1">
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25072.3">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>66fdab134fb3e72d0fc265fd4456fefd405cf07f</Sha>
<Sha>4b6227bb3f6d9161b320d22ea1a82fc78821f278</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25070.1">
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25072.3">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>66fdab134fb3e72d0fc265fd4456fefd405cf07f</Sha>
<Sha>4b6227bb3f6d9161b320d22ea1a82fc78821f278</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25070.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25072.3">
<Uri>https://github.com/dotnet/razor</Uri>
<Sha>66fdab134fb3e72d0fc265fd4456fefd405cf07f</Sha>
<Sha>4b6227bb3f6d9161b320d22ea1a82fc78821f278</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25072.6">
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25070.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25070.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25070.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25072.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25072.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25072.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
Expand Down
4 changes: 2 additions & 2 deletions src/RazorSdk/Tool/GenerateCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ private int ExecuteCore(
{
// Only output the file if we generated it without errors.
var outputFilePath = result.InputItem.OutputPath;
var generatedCode = result.CSharpDocument.GeneratedCode;
var generatedCode = result.CSharpDocument.Text.ToString();
if (isGeneratingDeclaration)
{
// When emiting declarations, only write if it the contents are different.
Expand All @@ -269,7 +269,7 @@ private int ExecuteCore(
}
}

File.WriteAllText(outputFilePath, result.CSharpDocument.GeneratedCode);
File.WriteAllText(outputFilePath, generatedCode);
}
}

Expand Down
6 changes: 0 additions & 6 deletions src/SourceBuild/content/repo-projects/razor.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<!-- The toolset compiler doesn't get killed with 'build-server shutdown'.
Instead of disabling shared compilation, disable the toolset compiler package. -->
<BuildArgs>$(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false</BuildArgs>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
</ItemGroup>
Expand Down
Loading