未验证 提交 8a359e55 编写于 作者: V Vatsan Madhavan 提交者: GitHub

Update tools.dotnet in global.json to 3.0.100-preview4-011144 (#547)

* Update dotnet version to 3.0.100-preview4-011144. This contains System.Drawing.SystemColors moved to the right place.

* Update dependencies

* Our tests aren't running on the just-produced bits yet. There is a bug in core-sdk that has lead to the ingestion of a new shared framework, but the dependent netcoreapp shared framework hasn't been taken in. This causes all WPF applications to break just now - which also means that our tests are failing for no reason other than the fact that they are WPF apps.

Disabling this now in release/3.0 branch. We will ensure that our tests are run against the right bits as part of the 'testhost' work in 'master'
上级 c5405c82
......@@ -67,13 +67,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19207.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b1f9e12fe3ee71c48ea60b15968745850ac0a4a7</Sha>
<Sha>63b76f3f952f821d0a7996427a9f3534f1c25ab7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19207.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19209.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b1f9e12fe3ee71c48ea60b15968745850ac0a4a7</Sha>
<Sha>63b76f3f952f821d0a7996427a9f3534f1c25ab7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -24,7 +24,7 @@
<SystemWindowsExtensionsPackageVersion>4.6.0-preview4.19208.6</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview4.19208.6</SystemCodeDomPackageVersion>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19207.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19209.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<SystemReflectionTypeLoaderPackageVersion>0.1.0-preview2-181205-2</SystemReflectionTypeLoaderPackageVersion>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
......
......@@ -22,7 +22,7 @@
<!-- Save Microsoft.NETCore.App assemblies, and remove those from @(ReferencePath) -->
<ItemGroup>
<_netCoreAppSdkReference Remove="@(_netCoreAppSdkReference)" />
<_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App'"/>
<_netCoreAppSdkReference Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App' Or '%(ReferencePath.NuGetPackageId)'=='Microsoft.NETCore.App.Ref'"/>
<ReferencePath Remove="@(_netCoreAppSdkReference)" />
</ItemGroup>
......
......@@ -24,6 +24,14 @@
<ItemGroup>
<FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\*.pdb"/>
<PackagesToPublishToSymbolServer Include="$(BlobBasePath)\*.symbols.nupkg"/>
<!--
These packages from Arcade-Services include some native libraries that
our current symbol uploader can't handle. Below is a workaround until
we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
-->
<PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Darc.*" />
<PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
</ItemGroup>
<PropertyGroup>
......
......@@ -5,6 +5,7 @@ parameters:
condition: succeeded()
continueOnError: false
runAsPublic: false
publishUsingPipelines: false
phases:
- phase: Asset_Registry_Publish
displayName: Publish to Build Asset Registry
......@@ -36,6 +37,7 @@ phases:
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:Configuration=$(_BuildConfig)
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
......
{
"tools": {
"dotnet": "3.0.100-preview-010024",
"dotnet": "3.0.100-preview4-011144",
"vs": {
"version": "16.0"
}
},
"sdk": {
"version": "3.0.100-preview-010024"
"version": "3.0.100-preview4-011144"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19207.1"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.2"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册