Skip to content

Bump SDK and disable RSG for BasicTestApp #32581

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

Merged
merged 5 commits into from
May 14, 2021
Merged

Bump SDK and disable RSG for BasicTestApp #32581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
809884a
Bump SDK and disable RSG for BasicTestApp
captainsafia May 11, 2021
f43f195
Update global.json
captainsafia May 13, 2021
da53f0f
Fix obsolete types and update SDK again
captainsafia May 13, 2021
e748f6f
Fake it till you make it
pranavkm May 13, 2021
f3ecadc
Bump SDK and skip OpenAPI tests
captainsafia May 14, 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
2 changes: 1 addition & 1 deletion eng/tools/RepoTasks/Uuid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static Guid Create(Guid namespaceId, string name)
Buffer.BlockCopy(nameBytes, 0, hashBuffer, 16, nameBytes.Length);
byte[] hash;

using (SHA256 sha256 = new SHA256Managed())
using (SHA256 sha256 = SHA256.Create())
{
hash = sha256.ComputeHash(hashBuffer);
}
Expand Down
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.5.21230.2"
"version": "6.0.100-preview.5.21264.3"
},
"tools": {
"dotnet": "6.0.100-preview.5.21230.2",
"dotnet": "6.0.100-preview.5.21264.3",
"runtimes": {
"dotnet/x64": [
"2.1.27",
Expand Down
1 change: 1 addition & 0 deletions src/Components/WebAssembly/testassets/WasmLinkerTest/WasmLinkerTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<UseMonoRuntime>true</UseMonoRuntime>
<UsingMicrosoftNETSdkBlazorWebAssembly>true</UsingMicrosoftNETSdkBlazorWebAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Metadata" />
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
22 changes: 11 additions & 11 deletions src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class OpenApiAddFileTests : OpenApiTestBase
{
public OpenApiAddFileTests(ITestOutputHelper output) : base(output) { }

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_Empty_ShowsHelp()
{
var app = GetApplication();
Expand All @@ -27,7 +27,7 @@ public void OpenApi_Empty_ShowsHelp()
Assert.Contains("Usage: openapi ", _output.ToString());
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_NoProjectExists()
{
var app = GetApplication();
Expand All @@ -38,7 +38,7 @@ public void OpenApi_NoProjectExists()
Assert.Equal(1, run);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_ExplicitProject_Missing()
{
var app = GetApplication();
Expand All @@ -50,7 +50,7 @@ public void OpenApi_ExplicitProject_Missing()
Assert.Equal(1, run);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_Add_Empty_ShowsHelp()
{
var app = GetApplication();
Expand All @@ -61,7 +61,7 @@ public void OpenApi_Add_Empty_ShowsHelp()
Assert.Contains("Usage: openapi add", _output.ToString());
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_Add_File_Empty_ShowsHelp()
{
var app = GetApplication();
Expand All @@ -72,7 +72,7 @@ public void OpenApi_Add_File_Empty_ShowsHelp()
Assert.Contains("Usage: openapi ", _output.ToString());
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_ReuseItemGroup()
{
var project = CreateBasicProject(withOpenApi: true);
Expand Down Expand Up @@ -101,7 +101,7 @@ public async Task OpenApi_Add_ReuseItemGroup()
Assert.Same(openApiRefs[0].ParentNode, openApiRefs[1].ParentNode);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_Add_File_EquivilentPaths()
{
var project = CreateBasicProject(withOpenApi: true);
Expand All @@ -126,7 +126,7 @@ public void OpenApi_Add_File_EquivilentPaths()
Assert.Single(openApiRefs);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_NSwagTypeScript()
{
var project = CreateBasicProject(withOpenApi: true);
Expand All @@ -146,7 +146,7 @@ public async Task OpenApi_Add_NSwagTypeScript()
Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\" CodeGenerator=\"NSwagTypeScript\" />", content);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_FromJson()
{
var project = CreateBasicProject(withOpenApi: true);
Expand All @@ -166,7 +166,7 @@ public async Task OpenApi_Add_FromJson()
Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_File_UseProjectOption()
{
var project = CreateBasicProject(withOpenApi: true);
Expand All @@ -186,7 +186,7 @@ public async Task OpenApi_Add_File_UseProjectOption()
Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFIle}\"", content);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_MultipleTimes_OnlyOneReference()
{
var project = CreateBasicProject(withOpenApi: true);
Expand Down
24 changes: 12 additions & 12 deletions src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class OpenApiAddURLTests : OpenApiTestBase
{
public OpenApiAddURLTests(ITestOutputHelper output) : base(output){ }

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_WithContentDisposition()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -48,7 +48,7 @@ public async Task OpenApi_Add_Url_WithContentDisposition()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenAPI_Add_Url_NoContentDisposition()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -81,7 +81,7 @@ public async Task OpenAPI_Add_Url_NoContentDisposition()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenAPI_Add_Url_NoExtension_AssumesJson()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -114,7 +114,7 @@ public async Task OpenAPI_Add_Url_NoExtension_AssumesJson()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_NoSegment()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -147,7 +147,7 @@ public async Task OpenApi_Add_Url_NoSegment()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -179,7 +179,7 @@ public async Task OpenApi_Add_Url()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_SameName_UniqueFile()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -239,7 +239,7 @@ public async Task OpenApi_Add_Url_SameName_UniqueFile()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_NSwagCSharp()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -271,7 +271,7 @@ public async Task OpenApi_Add_Url_NSwagCSharp()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_NSwagTypeScript()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -303,7 +303,7 @@ public async Task OpenApi_Add_Url_NSwagTypeScript()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_Url_OutputFile()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -335,7 +335,7 @@ public async Task OpenApi_Add_Url_OutputFile()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Add_URL_FileAlreadyExists_Fail()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down Expand Up @@ -393,7 +393,7 @@ public async Task OpenApi_Add_URL_FileAlreadyExists_Fail()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public void OpenApi_Add_URL_MultipleTimes_OnlyOneReference()
{
var project = CreateBasicProject(withOpenApi: false);
Expand All @@ -419,7 +419,7 @@ public void OpenApi_Add_URL_MultipleTimes_OnlyOneReference()
Assert.Single(Regex.Matches(content, escapedApiRef));
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenAPi_Add_URL_InvalidUrl()
{
var project = CreateBasicProject(withOpenApi: false);
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/Microsoft.dotnet-openapi/test/OpenApiRefreshTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class OpenApiRefreshTests : OpenApiTestBase
{
public OpenApiRefreshTests(ITestOutputHelper output) : base(output) { }

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Refresh_Basic()
{
CreateBasicProject(withOpenApi: false);
Expand Down
6 changes: 3 additions & 3 deletions src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class OpenApiRemoveTests : OpenApiTestBase
{
public OpenApiRemoveTests(ITestOutputHelper output) : base(output) { }

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Remove_File()
{
var nswagJsonFile = "openapi.json";
Expand Down Expand Up @@ -60,7 +60,7 @@ public async Task OpenApi_Remove_File()
Assert.False(File.Exists(Path.Combine(_tempDir.Root, nswagJsonFile)));
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Remove_ViaUrl()
{
_tempDir
Expand Down Expand Up @@ -148,7 +148,7 @@ public async Task OpenApi_Remove_Project()
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/32686")]
public async Task OpenApi_Remove_Multiple()
{
var nswagJsonFile = "openapi.json";
Expand Down