Skip to content
代码片段 群组 项目
提交 23a6e3ea 编辑于 作者: Doug Bunting's avatar Doug Bunting 提交者: William Godbe
浏览文件

Explicitly reference Roslyn compiler toolset version that will ship in preview 7 (#11818)

* Explicitly reference Roslyn compiler toolset version that will ship in preview 7
- see also aspnet/EntityFrameworkCore#16370 and aspnet/EntityFrameworkCore#16385 discussions
- grab latest from the '.NET Core 3 Release' channel

* Disable tests

* Update PackageVersion property

* Disable last test
上级 c966fffb
No related branches found
No related tags found
无相关合并请求
......@@ -125,6 +125,11 @@
<TargetingPackVersion Condition="'%(TargetFramework)' == 'netstandard2.1' and '$(IsServicingBuild)' != 'true'">$(NETStandardLibraryRefPackageVersion)</TargetingPackVersion>
</KnownFrameworkReference>
<!-- Track compiler separately from Arcade.-->
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>
<PropertyGroup Condition=" '$(CopySymbolsToArtifacts)' == 'true' AND '$(TargetFramework)' != '' ">
......
......@@ -420,5 +420,9 @@
<Uri>https://github.com/aspnet/Extensions</Uri>
<Sha>b5e1724093107d2133b3dab14197b8ff5dbff8ef</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta1-19351-01">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c91adff42c488aef2c2c532a7b053fb55e0c16ea</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -33,8 +33,6 @@
<PropertyGroup Label="Arcade settings">
<!-- Opt-in to Arcade tools for building VSIX projects. -->
<UsingToolVSSDK>true</UsingToolVSSDK>
<!-- Opt-in to using the version of the Roslyn compiler bundled with Arcade. -->
<UsingToolMicrosoftNetCompilers Condition="'$(MSBuildProjectExtension)' == '.csproj' or '$(MSBuildProjectExtension)' == '.fsproj' or '$(MSBuildProjectExtension)' == '.vbproj'">true</UsingToolMicrosoftNetCompilers>
<!-- Only use Microsoft.NETFramework.ReferenceAssemblies on non-windows builds. Using this on Windows breaks MVC runtime compilation. -->
<UsingToolNetFrameworkReferenceAssemblies Condition="'$(OS)' != 'Windows_NT'">true</UsingToolNetFrameworkReferenceAssemblies>
<!-- Disable XLIFF tasks -->
......@@ -53,6 +51,8 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19323.4</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta1-19351-01</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup -->
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview7-27901-06</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.0.0-preview7-27901-06</MicrosoftNETCoreAppRefPackageVersion>
......@@ -255,6 +255,10 @@
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND $(MicrosoftNetCompilersToolsetPackageVersion.Contains('-')) ">
$(RestoreSources);
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
</RestoreSources>
<!-- TODO remove this once we move Microsoft.Internal.AspNetCore.H2Spec.All to a non-myget feed -->
<RestoreSources>
$(RestoreSources);
......
......@@ -1142,7 +1142,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
Assert.Equal(initialValue, context.ValidationMetadata.IsRequired);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public void CreateValidationMetadata_InfersRequiredAttribute_NoNonNullableProperty()
{
// Arrange
......@@ -1325,7 +1325,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
Assert.Same(attribute, validatorMetadata);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public void IsNonNullable_FindsNonNullableProperty()
{
// Arrange
......@@ -1353,7 +1353,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
Assert.False(result);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public void IsNonNullable_FindsNonNullableParameter()
{
// Arrange
......
......@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
private HttpClient Client { get; set; }
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public async Task CanUseNonNullableReferenceType_WithController_OmitData_ValidationErrors()
{
// Arrange
......
......@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests
}
#nullable restore
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public async Task BindProperty_WithNonNullableReferenceType_NoData_ValidationError()
{
// Arrange
......@@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests
}
#nullable restore
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public async Task BindProperty_WithNonNullableReferenceType_NoData_ValidationError_CustomMessage()
{
// Arrange
......@@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests
}
#nullable restore
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/11828")]
public async Task BindParameter_WithNonNullableReferenceType_NoData_ValidationError()
{
// Arrange
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册