summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Hofer <viktor.hofer@microsoft.com>2018-09-27 06:43:48 +0200
committerTanner Gooding <tagoo@outlook.com>2018-09-26 21:43:48 -0700
commit0bc8c62cfb7514b91b4ebd5f073835391e0502a3 (patch)
treee2f8692ed14f9de1be6eefbcf5a5fb6737ff5be0
parent6dc2556a685674ecb9c716aa21720f2295ff8df0 (diff)
downloadcoreclr-0bc8c62cfb7514b91b4ebd5f073835391e0502a3.tar.gz
coreclr-0bc8c62cfb7514b91b4ebd5f073835391e0502a3.tar.bz2
coreclr-0bc8c62cfb7514b91b4ebd5f073835391e0502a3.zip
Maestro dependency update without buildtools (#20143)
* Update BuildTools, CoreClr, CoreFx, CoreSetup, PgoData to preview1-03224-03, preview1-26925-05, preview1-26925-06, preview1-26925-01, master-20180925-0031, respectively * Enable RestoreOutputPath override * Disable System.Security.Cryptography.Pkcs.Tests To help unblock corefx, etc. update. * Revert buildtools changes * Disable buildtools auto updates
-rw-r--r--ILAsmVersion.txt2
-rw-r--r--dependencies.props26
-rw-r--r--dir.props2
-rw-r--r--tests/CoreFX/CoreFX.issues.json9
4 files changed, 25 insertions, 14 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
index 8e2911ea90..67e551b15c 100644
--- a/ILAsmVersion.txt
+++ b/ILAsmVersion.txt
@@ -1 +1 @@
-3.0.0-preview1-26907-04
+3.0.0-preview1-26925-05
diff --git a/dependencies.props b/dependencies.props
index 4f8e5ce9da..13e83c97f5 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -23,23 +23,23 @@
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
- <CoreFxCurrentRef>467ad4c849546161f6f09f9485d48c4183c842ac</CoreFxCurrentRef>
- <CoreClrCurrentRef>467ad4c849546161f6f09f9485d48c4183c842ac</CoreClrCurrentRef>
+ <CoreFxCurrentRef>a3db01e68b8e44ca08a31a368d88d24f851302b5</CoreFxCurrentRef>
+ <CoreClrCurrentRef>a3db01e68b8e44ca08a31a368d88d24f851302b5</CoreClrCurrentRef>
<BuildToolsCurrentRef>e0c1d36d8a19fed21cadfff4890e027bd4c2c214</BuildToolsCurrentRef>
- <PgoDataCurrentRef>467ad4c849546161f6f09f9485d48c4183c842ac</PgoDataCurrentRef>
- <CoreSetupCurrentRef>467ad4c849546161f6f09f9485d48c4183c842ac</CoreSetupCurrentRef>
+ <PgoDataCurrentRef>a3db01e68b8e44ca08a31a368d88d24f851302b5</PgoDataCurrentRef>
+ <CoreSetupCurrentRef>a3db01e68b8e44ca08a31a368d88d24f851302b5</CoreSetupCurrentRef>
<IbcDataCurrentRef>e0c1d36d8a19fed21cadfff4890e027bd4c2c214</IbcDataCurrentRef>
</PropertyGroup>
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
- <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview1-26907-04</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
- <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26907-04</MicrosoftNETCorePlatformsPackageVersion>
- <PgoDataPackageVersion>99.99.99-master-20180907-0057</PgoDataPackageVersion>
- <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26907-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
- <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
+ <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview1-26925-06</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+ <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26925-06</MicrosoftNETCorePlatformsPackageVersion>
+ <PgoDataPackageVersion>99.99.99-master-20180925-0031</PgoDataPackageVersion>
+ <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26925-05</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+ <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26925-01</MicrosoftNETCoreAppPackageVersion>
<XunitPackageVersion>2.4.0-beta.2.build4010</XunitPackageVersion>
- <IbcDataPackageVersion>99.99.99-master-20180907-0057</IbcDataPackageVersion>
+ <IbcDataPackageVersion>99.99.99-master-20180917-0046</IbcDataPackageVersion>
<IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.4</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
@@ -55,7 +55,7 @@
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
- <FeedTasksPackageVersion>2.2.0-preview1-03116-01</FeedTasksPackageVersion>
+ <FeedTasksPackageVersion>3.0.0-preview1-03224-03</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Publish symbol build task package -->
@@ -127,7 +127,7 @@
<ElementName>MicrosoftNETCoreAppPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.App</PackageId>
</XmlUpdateStep>
- <UpdateStep Include="BuildTools">
+ <!-- <UpdateStep Include="BuildTools">
<UpdaterType>File</UpdaterType>
<Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path>
<PackageId>Microsoft.DotNet.BuildTools</PackageId>
@@ -136,7 +136,7 @@
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>FeedTasksPackageVersion</ElementName>
<PackageId>$(FeedTasksPackage)</PackageId>
- </XmlUpdateStep>
+ </XmlUpdateStep> -->
<XmlUpdateStep Include="PgoData">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>PgoDataPackageVersion</ElementName>
diff --git a/dir.props b/dir.props
index d71397c584..b9ebad4e66 100644
--- a/dir.props
+++ b/dir.props
@@ -86,6 +86,8 @@
<!-- Default to portable build if not explicitly set -->
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
+
+ <OverrideRestoreOutputPath>true</OverrideRestoreOutputPath>
</PropertyGroup>
<!-- Output paths -->
diff --git a/tests/CoreFX/CoreFX.issues.json b/tests/CoreFX/CoreFX.issues.json
index c56895de1b..9c3970738c 100644
--- a/tests/CoreFX/CoreFX.issues.json
+++ b/tests/CoreFX/CoreFX.issues.json
@@ -420,5 +420,14 @@
}
]
}
+ },
+ {
+ "name": "System.Security.Cryptography.Pkcs.Tests",
+ "enabled": false,
+ "exclusions": {
+ "namespaces": null,
+ "classes": null,
+ "methods": null
+ }
}
]