Permalink
Browse files

Arcade SDK 1.0.0-beta.18613.19 (#31778)

* Arcade SDK 1.0.0-beta.18613.10

* Keep workaround for bad Test SDK package

* Arcade 1.0.0-beta.18613.19

* Change the order of imports

* Disable SourceLink, Xliff in WPF temp projects
  • Loading branch information...
tmat committed Dec 14, 2018
1 parent fd96539 commit 1a99a8c93ed479ff8fbec02b7ba0cfef926257d6
Showing with 101 additions and 2,587 deletions.
  1. +1 −0 Directory.Build.props
  2. +1 −0 Directory.Build.targets
  3. +4 −0 NuGet.config
  4. +3 −2 eng/Versions.props
  5. +36 −12 eng/common/tools.ps1
  6. +32 −5 eng/common/tools.sh
  7. +2 −3 eng/targets/Imports.targets
  8. +0 −26 eng/targets/RepoToolset/AfterSigning.proj
  9. +0 −18 eng/targets/RepoToolset/AfterSolutionBuild.proj
  10. +0 −222 eng/targets/RepoToolset/Build.proj
  11. +0 −32 eng/targets/RepoToolset/BuildReleasePackages.targets
  12. +0 −6 eng/targets/RepoToolset/BuildStep.props
  13. +0 −14 eng/targets/RepoToolset/BuildTasks.props
  14. +0 −100 eng/targets/RepoToolset/DefaultVersions.props
  15. +0 −5 eng/targets/RepoToolset/Directory.Build.props
  16. +0 −5 eng/targets/RepoToolset/Directory.Build.targets
  17. +0 −48 eng/targets/RepoToolset/GenerateInternalsVisibleTo.targets
  18. +0 −36 eng/targets/RepoToolset/Imports.targets
  19. +0 −32 eng/targets/RepoToolset/Localization.targets
  20. +0 −41 eng/targets/RepoToolset/NativeVersion.rc
  21. +0 −93 eng/targets/RepoToolset/OptimizationData.targets
  22. +0 −32 eng/targets/RepoToolset/Performance.targets
  23. +0 −139 eng/targets/RepoToolset/ProjectDefaults.props
  24. +0 −26 eng/targets/RepoToolset/ProjectLayout.props
  25. +0 −148 eng/targets/RepoToolset/Publish.proj
  26. +0 −68 eng/targets/RepoToolset/RepoLayout.props
  27. +0 −44 eng/targets/RepoToolset/RepositoryInfo.targets
  28. +0 −19 eng/targets/RepoToolset/Settings.props
  29. +0 −96 eng/targets/RepoToolset/Sign.proj
  30. +0 −18 eng/targets/RepoToolset/StrongName.props
  31. +0 −93 eng/targets/RepoToolset/StrongName.targets
  32. +0 −111 eng/targets/RepoToolset/SymStore.targets
  33. +0 −49 eng/targets/RepoToolset/Tests.props
  34. +0 −79 eng/targets/RepoToolset/Tests.targets
  35. +0 −58 eng/targets/RepoToolset/Tools.proj
  36. +0 −111 eng/targets/RepoToolset/Version.props
  37. +0 −47 eng/targets/RepoToolset/Version.targets
  38. +0 −18 eng/targets/RepoToolset/VisualStudio.DesignTimeBuild.targets
  39. +0 −11 eng/targets/RepoToolset/VisualStudio.ImportSdk.targets
  40. +0 −39 eng/targets/RepoToolset/VisualStudio.InsertionManifests.targets
  41. +0 −36 eng/targets/RepoToolset/VisualStudio.SetupPackage.swixproj
  42. +0 −37 eng/targets/RepoToolset/VisualStudio.SetupPackage.vsmanproj
  43. +0 −34 eng/targets/RepoToolset/VisualStudio.props
  44. +0 −273 eng/targets/RepoToolset/VisualStudio.targets
  45. +0 −143 eng/targets/RepoToolset/Workarounds.targets
  46. +0 −15 eng/targets/RepoToolset/XUnit/XUnit.props
  47. +0 −124 eng/targets/RepoToolset/XUnit/XUnit.targets
  48. +0 −3 eng/targets/RepoToolset/XUnit/xunit.runner.json
  49. BIN eng/targets/RepoToolset/snk/35MSSharedLib1024.snk
  50. BIN eng/targets/RepoToolset/snk/AspNetCore.snk
  51. BIN eng/targets/RepoToolset/snk/ECMA.snk
  52. BIN eng/targets/RepoToolset/snk/MSFT.snk
  53. BIN eng/targets/RepoToolset/snk/Open.snk
  54. BIN eng/targets/RepoToolset/snk/SilverlightPlatformPublicKey.snk
  55. +11 −4 eng/targets/Settings.props
  56. +3 −0 global.json
  57. +2 −2 src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj
  58. +5 −6 src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
  59. +1 −4 src/Setup/Installer/Installer.Package.csproj
@@ -1,5 +1,6 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\targets\Settings.props" />
</Project>

@@ -1,4 +1,5 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\targets\Imports.targets" />
</Project>
@@ -10,5 +10,9 @@
</packageRestore>
<packageSources>
<clear />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
</disabledPackageSources>
</configuration>
@@ -78,9 +78,11 @@
<MicrosoftNETCoreCompilersVersion>2.9.0-beta7-63018-03</MicrosoftNETCoreCompilersVersion>
<MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.0</MicrosoftNETCoreRuntimeCoreCLRVersion>
<!-- Using a private build of Microsoft.Net.Test.SDK to work around issue https://github.com/Microsoft/vstest/issues/1764 -->
<MicrosoftNETTestSdkVersion>15.9.0-dev2</MicrosoftNETTestSdkVersion>
<MicrosoftServiceHubClientVersion>1.3.23</MicrosoftServiceHubClientVersion>
<MicrosoftTplDataflowVersion>4.5.24</MicrosoftTplDataflowVersion>
<MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
<MicrosoftVisualBasicVersion>10.1.0</MicrosoftVisualBasicVersion>
<MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>15.8.27812-alpha</MicrosoftVisualStudioCallHierarchyPackageDefinitionsVersion>
<MicrosoftVisualStudioCodeAnalysisSdkUIVersion>15.8.27812-alpha</MicrosoftVisualStudioCodeAnalysisSdkUIVersion>
<MicrosoftVisualStudioCodingConventionsVersion>1.1.20180503.2</MicrosoftVisualStudioCodingConventionsVersion>
@@ -152,7 +154,6 @@
<RoslynDependenciesOptimizationDataVersion>2.11.0-beta3.20181005.1</RoslynDependenciesOptimizationDataVersion>
<RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
<RoslynToolsVSIXExpInstallerVersion>1.0.0-beta2-63222-01</RoslynToolsVSIXExpInstallerVersion>
<RoslynToolsBuildTasksVersion>1.0.0-beta3.18526.1</RoslynToolsBuildTasksVersion>
<RoslynToolsOptProfVersion>1.0.0-beta3.18524.2</RoslynToolsOptProfVersion>
<RoslynOptProfRunSettingsGeneratorVersion>1.0.0-beta3.18610.1</RoslynOptProfRunSettingsGeneratorVersion>
<RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>4.3.0</RoslynToolsLightUpSystemRuntimeLoaderFixedVersion>
@@ -1,7 +1,3 @@
#
# TODO: This file is currently a subset of Arcade's tools.ps1.
#

# Initialize variables if they aren't already defined.
# These may be defined as parameters of the importing script, or set after importing this script.

@@ -91,7 +87,7 @@ function Exec-Process([string]$command, [string]$commandArgs) {
}

function InitializeDotNetCli([bool]$install) {
if (Test-Path global:_DotNetInstallDir) {
if (Test-Path variable:global:_DotNetInstallDir) {
return $global:_DotNetInstallDir
}

@@ -174,7 +170,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version) {
# Throws on failure.
#
function InitializeVisualStudioMSBuild([bool]$install) {
if (Test-Path global:_MSBuildExe) {
if (Test-Path variable:global:_MSBuildExe) {
return $global:_MSBuildExe
}

@@ -260,8 +256,9 @@ function InstallXCopyMSBuild([string] $packageVersion) {
# or $null if no instance meeting the requirements is found on the machine.
#
function LocateVisualStudio {
$vswhereVersion = Get-Member -InputObject $GlobalJson.tools -Name "vswhere"
if ($vsWhereVersion -eq $null) {
if (Get-Member -InputObject $GlobalJson.tools -Name "vswhere") {
$vswhereVersion = $GlobalJson.tools.vswhere
} else {
$vswhereVersion = "2.5.2"
}

@@ -300,7 +297,7 @@ function LocateVisualStudio {
}

function InitializeBuildTool() {
if (Test-Path global:_BuildTool) {
if (Test-Path variable:global:_BuildTool) {
return $global:_BuildTool
}

@@ -367,14 +364,40 @@ function GetNuGetPackageCachePath() {
}

function InitializeToolset() {
if (Test-Path global:_ToolsetBuildProj) {
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
}

$nugetCache = GetNuGetPackageCachePath

# TODO: Restore Arcade SDK here.
$path = Join-Path $EngRoot "targets\RepoToolset\Build.proj"
$toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"

if (Test-Path $toolsetLocationFile) {
$path = Get-Content $toolsetLocationFile -TotalCount 1
if (Test-Path $path) {
return $global:_ToolsetBuildProj = $path
}
}

if (-not $restore) {
Write-Host "Toolset version $toolsetVersion has not been restored."
ExitWithExitCode 1
}

$buildTool = InitializeBuildTool

$proj = Join-Path $ToolsetDir "restore.proj"
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "ToolsetRestore.binlog") } else { "" }

'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
MSBuild $proj $bl /t:__WriteToolsetLocation /noconsolelogger /p:__ToolsetLocationOutputFile=$toolsetLocationFile

$path = Get-Content $toolsetLocationFile -TotalCount 1
if (!(Test-Path $path)) {
throw "Invalid toolset path: $path"
}

return $global:_ToolsetBuildProj = $path
}

@@ -462,6 +485,7 @@ $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration
$TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration
$GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json

Create-Directory $ToolsetDir
Create-Directory $TempDir
Create-Directory $LogDir

@@ -1,8 +1,5 @@
#!/usr/bin/env bash

#
# TODO: This file is currently a subset of Arcade's init-tools.ps1.
#
# Stop script if unbound variable found (use ${var:-} if intentional)
set -u

@@ -212,8 +209,37 @@ function InitializeToolset {

GetNuGetPackageCachePath

# TODO: restore Arcade SDK
local toolset_build_proj="$eng_root/targets/RepoToolset/Build.proj"
ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"

local toolset_version=$_ReadGlobalVersion
local toolset_location_file="$toolset_dir/$toolset_version.txt"

if [[ -a "$toolset_location_file" ]]; then
local path=`cat "$toolset_location_file"`
if [[ -a "$path" ]]; then
# return value
_InitializeToolset="$path"
return
fi
fi

if [[ "$restore" != true ]]; then
echo "Toolset version $toolsetVersion has not been restored." >&2
ExitWithExitCode 2
fi

local toolset_restore_log="$log_dir/ToolsetRestore.binlog"
local proj="$toolset_dir/restore.proj"

echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
MSBuild "$proj" /t:__WriteToolsetLocation /noconsolelogger /bl:"$toolset_restore_log" /p:__ToolsetLocationOutputFile="$toolset_location_file"

local toolset_build_proj=`cat "$toolset_location_file"`

if [[ ! -a "$toolset_build_proj" ]]; then
echo "Invalid toolset path: $toolset_build_proj" >&2
ExitWithExitCode 3
fi

# return value
_InitializeToolset="$toolset_build_proj"
@@ -280,6 +306,7 @@ if [[ -z $HOME ]]; then
mkdir -p "$HOME"
fi

mkdir -p "$toolset_dir"
mkdir -p "$temp_dir"
mkdir -p "$log_dir"

@@ -6,7 +6,6 @@
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<Import Project="RepoToolset\Imports.targets" />
<Import Project="VisualStudio.targets"/>
<Import Project="XUnit.targets" Condition="'$(IsTestProject)' == 'true'" />

@@ -116,8 +115,8 @@
DestinationFolder="$(OutDir)" />
</Target>

<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(RoslynToolsBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.CompareVersions" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
<UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SingleError" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />

<Target Name="_CheckRequiredMSBuildVersion" BeforeTargets="BeforeBuild">
<CompareVersions Left="$(MSBuildVersion)" Right="$(MinimumMSBuildVersion)">

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 1a99a8c

Please sign in to comment.