Skip to content

Revert multiple SDK updates. #33920

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

Closed
halter73 wants to merge 2 commits into from
Closed

Revert multiple SDK updates. #33920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3934c2c
Revert "Update SDK to pick up incremental Razor source generator (#33…
halter73 Jun 28, 2021
1edb33b
Revert "Update SDK version (#33719)"
halter73 Jun 28, 2021
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
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.100-preview.7.21327.2"
"version": "6.0.100-preview.6.21313.2"
},
"tools": {
"dotnet": "6.0.100-preview.7.21327.2",
"dotnet": "6.0.100-preview.6.21313.2",
"runtimes": {
"dotnet/x64": [
"2.1.27",
Expand Down
1 change: 1 addition & 0 deletions src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
Clien caching isn't part of our performance measurement, so we'll skip it.
-->
<BlazorCacheBootResources>false</BlazorCacheBootResources>
<UseRazorSourceGenerator>false</UseRazorSourceGenerator>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<!-- Project supports more than one language -->
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
<UseRazorSourceGenerator>false</UseRazorSourceGenerator>
</PropertyGroup>

<PropertyGroup Condition="'$(TestTrimmedApps)' == 'true'">
Expand Down
2 changes: 2 additions & 0 deletions src/ProjectTemplates/Shared/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ internal async Task<ProcessResult> RunDotNetNewAsync(
Directory.Delete(TemplateOutputDir, recursive: true);
}

// Temporary while investigating why this process occasionally never runs or exits on Debian 9
environmentVariables.Add("COREHOST_TRACE", "1");
Copy link
Contributor

@JunTaoLuo JunTaoLuo Jun 28, 2021

Choose a reason for hiding this comment

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

Remember to revert this if you end up checking this in.

using var execution = ProcessEx.Run(Output, AppContext.BaseDirectory, DotNetMuxer.MuxerPathOrDefault(), argString, environmentVariables);
await execution.Exited;
return new ProcessResult(execution);
Expand Down
4 changes: 2 additions & 2 deletions src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ private static async Task InstallTemplatePackages(ITestOutputHelper output)

private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)
{
var proc = await RunDotNetNew(output, $"--list");
if (!(proc.Output.Contains($" {templateName} ") || proc.Output.Contains($",{templateName}") || proc.Output.Contains($"{templateName},")))
var proc = await RunDotNetNew(output, $"");
if (!proc.Output.Contains($" {templateName} "))
{
throw new InvalidOperationException($"Couldn't find {templateName} as an option in {proc.Output}.");
}
Expand Down