Skip to content

Commit 19ee2b1

Browse files
tmattmat
authored
Arcade 1.0.0-beta.18428.1 (#111)
* Arcade 1.0.0-beta.18428.1
1 parent 7de982e commit 19ee2b1

17 files changed

+78
-106
lines changed

Diff for: ‎.vsts-ci.yml

+18-13
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,55 @@ steps:
1212
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
1313
displayName: Install Signing Plugin
1414
inputs:
15-
signType: real
15+
signType: $(SignType)
1616
esrpSigning: true
17+
condition: and(succeeded(), ne(variables['SignType'], ''))
1718

1819
- task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
1920
displayName: Install Swix Plugin
2021

2122
- script: eng\common\CIBuild.cmd
22-
-configuration $(BuildConfiguration)
23-
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
24-
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
23+
-configuration $(BuildConfiguration)
24+
/p:PB_PublishBlobFeedKey=$(PB_PublishBlobFeedKey)
25+
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
26+
/p:DotNetSignType=$(SignType)
27+
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
28+
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
2529
displayName: Build
2630

2731
- task: PublishTestResults@1
2832
displayName: Publish Test Results
2933
inputs:
3034
testRunner: XUnit
31-
testResultsFiles: 'artifacts/$(BuildConfiguration)/TestResults/*.xml'
35+
testResultsFiles: 'artifacts/TestResults/$(BuildConfiguration)/*.xml'
3236
mergeTestResults: true
3337
testRunTitle: 'Unit Tests'
3438
condition: succeededOrFailed()
3539

3640
- task: NuGetPublisher@0
3741
displayName: Publish NuGet Packages to MyGet
3842
inputs:
39-
searchPattern: 'artifacts\$(BuildConfiguration)\packages\Shipping\*.nupkg'
43+
searchPattern: 'artifacts\packages\$(BuildConfiguration)\Shipping\*.nupkg'
4044
connectedServiceName: 'InteractiveWindow NuGet feed'
4145
nuGetVersion: 4.0.0.2283
46+
condition: succeeded()
4247

4348
- task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
4449
displayName: Publish VS Insertion Artifacts
4550
inputs:
46-
DropFolder: 'artifacts\$(BuildConfiguration)\VSSetup\Insertion'
51+
DropFolder: 'artifacts\VSSetup\$(BuildConfiguration)\Insertion'
4752

4853
- task: CopyPublishBuildArtifacts@1
4954
displayName: Publish Artifacts
5055
inputs:
5156
CopyRoot: '$(Build.SourcesDirectory)'
5257
Contents: |
53-
artifacts\$(BuildConfiguration)\bin
54-
artifacts\$(BuildConfiguration)\log
55-
artifacts\$(BuildConfiguration)\TestResults
56-
artifacts\$(BuildConfiguration)\SymStore
57-
artifacts\$(BuildConfiguration)\packages
58-
artifacts\$(BuildConfiguration)\VSSetup
58+
artifacts\bin\$(BuildConfiguration)
59+
artifacts\log\$(BuildConfiguration)
60+
artifacts\TestResults\$(BuildConfiguration)
61+
artifacts\SymStore\$(BuildConfiguration)
62+
artifacts\packages\$(BuildConfiguration)
63+
artifacts\VSSetup\$(BuildConfiguration)
5964
ArtifactName: '$(Build.BuildNumber)'
6065
ArtifactType: FilePath
6166
TargetPath: '$(DropRoot)\$(TeamName)\$(Build.DefinitionName)'

Diff for: ‎Build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
33
exit /b %ErrorLevel%

Diff for: ‎InteractiveWindow.sln

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio 15
3+
VisualStudioVersion = 15.0.27110.0
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "src\Microsoft.VisualStudio.InteractiveWindow\Microsoft.VisualStudio.InteractiveWindow.csproj", "{01E9BD68-0339-4A13-B42F-A3CA84D164F3}"
76
EndProject

Diff for: ‎Restore.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
33
exit /b %ErrorLevel%

Diff for: ‎Test.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -test %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -test %*"
33
exit /b %ErrorLevel%

Diff for: ‎eng/SignToolData.json

-30
This file was deleted.

Diff for: ‎eng/Versions.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
<!-- This repo version -->
77
<VersionPrefix>2.9.0</VersionPrefix>
8-
<PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel>beta2</PreReleaseVersionLabel>
9+
<SemanticVersioningV1>true</SemanticVersioningV1>
910

1011
<!-- Opt-in repo features -->
1112
<UsingToolVSSDK>true</UsingToolVSSDK>

Diff for: ‎eng/common/CIBuild.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
33
exit /b %ErrorLevel%

Diff for: ‎eng/common/build.ps1

+12-10
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ function InitializeDotNetCli {
7979

8080
# Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
8181
# otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues.
82-
if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$($GlobalJson.sdk.version)"))) {
82+
if (($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$($GlobalJson.tools.dotnet)"))) {
8383
$dotnetRoot = $env:DOTNET_INSTALL_DIR
8484
} else {
8585
$dotnetRoot = Join-Path $RepoRoot ".dotnet"
8686
$env:DOTNET_INSTALL_DIR = $dotnetRoot
8787

8888
if ($restore) {
89-
InstallDotNetSdk $dotnetRoot $GlobalJson.sdk.version
89+
InstallDotNetSdk $dotnetRoot $GlobalJson.tools.dotnet
9090
}
9191
}
9292

@@ -130,7 +130,7 @@ function InitializeVisualStudioBuild {
130130
}
131131

132132
function LocateVisualStudio {
133-
$vswhereVersion = $GlobalJson.vswhere.version
133+
$vswhereVersion = $GlobalJson.tools.vswhere
134134
$toolsRoot = Join-Path $RepoRoot ".tools"
135135
$vsWhereDir = Join-Path $toolsRoot "vswhere\$vswhereVersion"
136136
$vsWhereExe = Join-Path $vsWhereDir "vswhere.exe"
@@ -152,15 +152,17 @@ function LocateVisualStudio {
152152
}
153153

154154
function GetBuildCommand() {
155-
if ((Get-Member -InputObject $GlobalJson -Name "sdk") -ne $null) {
155+
$tools = $GlobalJson.tools
156+
157+
if ((Get-Member -InputObject $tools -Name "dotnet") -ne $null) {
156158
$dotnetRoot = InitializeDotNetCli
157159

158160
# by default build with dotnet cli:
159161
$buildDriver = Join-Path $dotnetRoot "dotnet.exe"
160162
$buildArgs = "msbuild"
161163
}
162164

163-
if ((Get-Member -InputObject $GlobalJson -Name "vswhere") -ne $null) {
165+
if ((Get-Member -InputObject $tools -Name "vswhere") -ne $null) {
164166
$vsInstallDir = InitializeVisualStudioBuild
165167

166168
# Presence of vswhere.version indicates the repo needs to build using VS msbuild:
@@ -169,7 +171,7 @@ function GetBuildCommand() {
169171
}
170172

171173
if ($buildDriver -eq $null) {
172-
Write-Host "/global.json must either specify 'sdk.version' or 'vswhere.version'." -ForegroundColor Red
174+
Write-Host "/global.json must either specify 'tools.dotnet' or 'tools.vswhere'." -ForegroundColor Red
173175
exit 1
174176
}
175177

@@ -181,7 +183,7 @@ function GetBuildCommand() {
181183
}
182184

183185
function InitializeToolset([string] $buildDriver, [string]$buildArgs) {
184-
$toolsetVersion = $GlobalJson.'msbuild-sdks'.'RoslynTools.RepoToolset'
186+
$toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
185187
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
186188

187189
if (Test-Path $toolsetLocationFile) {
@@ -199,7 +201,7 @@ function InitializeToolset([string] $buildDriver, [string]$buildArgs) {
199201

200202
$proj = Join-Path $ToolsetDir "restore.proj"
201203

202-
'<Project Sdk="RoslynTools.RepoToolset"/>' | Set-Content $proj
204+
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' | Set-Content $proj
203205
& $buildDriver $buildArgs $proj /t:__WriteToolsetLocation /m /nologo /clp:None /warnaserror /bl:$ToolsetRestoreLog /v:$verbosity /p:__ToolsetLocationOutputFile=$toolsetLocationFile
204206

205207
if ($lastExitCode -ne 0) {
@@ -268,10 +270,10 @@ try {
268270
$EngRoot = Join-Path $PSScriptRoot ".."
269271
$ArtifactsDir = Join-Path $RepoRoot "artifacts"
270272
$ToolsetDir = Join-Path $ArtifactsDir "toolset"
271-
$LogDir = Join-Path (Join-Path $ArtifactsDir $configuration) "log"
273+
$LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration
272274
$BuildLog = Join-Path $LogDir "Build.binlog"
273275
$ToolsetRestoreLog = Join-Path $LogDir "ToolsetRestore.binlog"
274-
$TempDir = Join-Path (Join-Path $ArtifactsDir $configuration) "tmp"
276+
$TempDir = Join-Path (Join-Path $ArtifactsDir "tmp") $configuration
275277
$GlobalJson = Get-Content -Raw -Path (Join-Path $RepoRoot "global.json") | ConvertFrom-Json
276278

277279
if ($projects -eq "") {

Diff for: ‎eng/common/build.sh

+26-29
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,6 @@ prepare_machine=false
3030
verbosity='minimal'
3131
properties=''
3232

33-
repo_root="$scriptroot/../.."
34-
eng_root="$scriptroot/.."
35-
artifacts_dir="$repo_root/artifacts"
36-
artifacts_configuration_dir="$artifacts_dir/$configuration"
37-
toolset_dir="$artifacts_dir/toolset"
38-
log_dir="$artifacts_configuration_dir/log"
39-
build_log="$log_dir/Build.binlog"
40-
toolset_restore_log="$log_dir/ToolsetRestore.binlog"
41-
temp_dir="$artifacts_configuration_dir/tmp"
42-
43-
global_json_file="$repo_root/global.json"
44-
build_driver=""
45-
toolset_build_proj=""
46-
4733
while (($# > 0)); do
4834
lowerI="$(echo $1 | awk '{print tolower($0)}')"
4935
case $lowerI in
@@ -132,25 +118,37 @@ while (($# > 0)); do
132118
esac
133119
done
134120

135-
# ReadJson [filename] [json key]
136-
# Result: Sets 'readjsonvalue' to the value of the provided json key
137-
# Note: this method may return unexpected results if there are duplicate
138-
# keys in the json
139-
function ReadJson {
140-
local file=$1
141-
local key=$2
121+
repo_root="$scriptroot/../.."
122+
eng_root="$scriptroot/.."
123+
artifacts_dir="$repo_root/artifacts"
124+
toolset_dir="$artifacts_dir/toolset"
125+
log_dir="$artifacts_dir/log/$configuration"
126+
build_log="$log_dir/Build.binlog"
127+
toolset_restore_log="$log_dir/ToolsetRestore.binlog"
128+
temp_dir="$artifacts_dir/tmp/$configuration"
129+
130+
global_json_file="$repo_root/global.json"
131+
build_driver=""
132+
toolset_build_proj=""
133+
134+
# ReadVersionFromJson [json key]
135+
function ReadGlobalVersion {
136+
local key=$1
142137

143138
local unamestr="$(uname)"
144139
local sedextended='-r'
145140
if [[ "$unamestr" == 'Darwin' ]]; then
146141
sedextended='-E'
147142
fi;
148143

149-
readjsonvalue="$(grep -m 1 "\"$key\"" $file | sed $sedextended 's/^ *//;s/.*: *"//;s/",?//')"
150-
if [[ ! "$readjsonvalue" ]]; then
151-
echo "Error: Cannot find \"$key\" in $file" >&2;
144+
local version="$(grep -m 1 "\"$key\"" $global_json_file | sed $sedextended 's/^ *//;s/.*: *"//;s/",?//')"
145+
if [[ ! "$version" ]]; then
146+
echo "Error: Cannot find \"$key\" in $global_json_file" >&2;
152147
ExitWithExitCode 1
153148
fi;
149+
150+
# return value
151+
echo "$version"
154152
}
155153

156154
function InitializeDotNetCli {
@@ -165,8 +163,8 @@ function InitializeDotNetCli {
165163
export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
166164
fi
167165

168-
ReadJson "$global_json_file" "version"
169-
local dotnet_sdk_version="$readjsonvalue"
166+
167+
local dotnet_sdk_version=`ReadGlobalVersion "dotnet"`
170168
local dotnet_root=""
171169

172170
# Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version,
@@ -220,8 +218,7 @@ function GetDotNetInstallScript {
220218
}
221219

222220
function InitializeToolset {
223-
ReadJson $global_json_file "RoslynTools.RepoToolset"
224-
local toolset_version=$readjsonvalue
221+
local toolset_version=`ReadGlobalVersion "Microsoft.DotNet.Arcade.Sdk"`
225222
local toolset_location_file="$toolset_dir/$toolset_version.txt"
226223

227224
if [[ -a "$toolset_location_file" ]]; then
@@ -239,7 +236,7 @@ function InitializeToolset {
239236

240237
local proj="$toolset_dir/restore.proj"
241238

242-
echo '<Project Sdk="RoslynTools.RepoToolset"/>' > $proj
239+
echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > $proj
243240
"$build_driver" msbuild $proj /t:__WriteToolsetLocation /m /nologo /clp:None /warnaserror /bl:$toolset_restore_log /v:$verbosity /p:__ToolsetLocationOutputFile=$toolset_location_file
244241
local lastexitcode=$?
245242

Diff for: ‎global.json

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
2-
"sdk": {
3-
"version": "2.1.300"
2+
"tools": {
3+
"dotnet": "2.1.400-preview-009088",
4+
"vswhere": "2.2.7"
45
},
56
"msbuild-sdks": {
6-
"RoslynTools.RepoToolset": "1.0.0-beta2-63110-06"
7-
},
8-
"vswhere": {
9-
"version": "2.2.7"
7+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18428.1"
108
}
119
}

Diff for: ‎netci.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static addGithubPRTriggerForBranch(def job, def branchName, def jobName) {
2323
}
2424

2525
static addXUnitDotNETResults(def job, def configName) {
26-
def resultFilePattern = "**/artifacts/${configName}/TestResults/*.xml"
26+
def resultFilePattern = "**/artifacts/TestResults/${configName}/*.xml"
2727
def skipIfNoTestFiles = false
2828

2929
Utilities.addXUnitDotNETResults(job, resultFilePattern, skipIfNoTestFiles)
@@ -51,7 +51,7 @@ static addBuildSteps(def job, def projectName, def os, def configName, def isPR)
5151

5252
def branchName = GithubBranchName
5353

54-
def filesToArchive = "**/artifacts/${configName}/**"
54+
def filesToArchive = "artifacts/**"
5555

5656
def jobName = getJobName(os, configName)
5757
def fullJobName = Utilities.getFullJobName(projectName, jobName, isPR)

Diff for: ‎nuget.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<!-- Only specify feed for RepoToolset SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
3+
<!-- Only specify feed for Arcade SDK (see https://github.com/Microsoft/msbuild/issues/2982) -->
44
<packageSources>
55
<clear />
6-
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
6+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
77
</packageSources>
88
</configuration>

Diff for: ‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
55
</PropertyGroup>
66

7-
<Import Project="Sdk.props" Sdk="RoslynTools.RepoToolset" />
7+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
88

99
<PropertyGroup>
1010
<LangVersion>Latest</LangVersion>

Diff for: ‎src/Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
22
<Project>
3-
<Import Project="Sdk.targets" Sdk="RoslynTools.RepoToolset" />
3+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44
</Project>

Diff for: ‎src/Microsoft.VisualStudio.InteractiveWindow.Tests/TestUtilities/Threading/WpfFactDiscoverer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public WpfFactDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnosticMe
1616
}
1717

1818
protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
19-
=> new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod);
19+
=> new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
2020
}
2121
}

0 commit comments

Comments
 (0)