Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit 5ef648c

Browse files
radicalradical
authored
Merge pull request #139 from radical/master-update
Merge remote-tracking branch 'origin/master' into xplat-master
2 parents ef1b575 + e31ea85 commit 5ef648c

File tree

202 files changed

+15066
-2495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+15066
-2495
lines changed

‎.vsts-dotnet.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ stages:
191191
- template: /eng/common/templates/job/publish-build-assets.yml
192192
parameters:
193193
enablePublishBuildArtifacts: true
194+
publishUsingPipelines: true
194195
dependsOn:
195196
- Windows_NT
196197
pool:

‎MSBuild.SourceBuild.sln‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks", "sr
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Utilities", "src\Utilities\Microsoft.Build.Utilities.csproj", "{C51C04F6-D35B-4211-B0F2-9D69F63AC0BC}"
1515
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Localization", "src\Package\Localization\Localization.csproj", "{243181BA-73D1-4B14-BA29-EBB8D183F573}"
17+
EndProject
1618
Global
1719
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1820
Debug|Any CPU = Debug|Any CPU
@@ -182,6 +184,36 @@ Global
182184
{C51C04F6-D35B-4211-B0F2-9D69F63AC0BC}.Release-MONO|x64.Build.0 = Release|x64
183185
{C51C04F6-D35B-4211-B0F2-9D69F63AC0BC}.Release-MONO|x86.ActiveCfg = Release|Any CPU
184186
{C51C04F6-D35B-4211-B0F2-9D69F63AC0BC}.Release-MONO|x86.Build.0 = Release|Any CPU
187+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
188+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|Any CPU.Build.0 = Debug|Any CPU
189+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|x64.ActiveCfg = Debug|x64
190+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|x64.Build.0 = Debug|x64
191+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|x86.ActiveCfg = Debug|Any CPU
192+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug|x86.Build.0 = Debug|Any CPU
193+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|Any CPU.ActiveCfg = Debug-MONO|Any CPU
194+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|Any CPU.Build.0 = Debug-MONO|Any CPU
195+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|x64.ActiveCfg = Debug-MONO|x64
196+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|x64.Build.0 = Debug-MONO|x64
197+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|x86.ActiveCfg = Debug-MONO|Any CPU
198+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Debug-MONO|x86.Build.0 = Debug-MONO|Any CPU
199+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
200+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
201+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|x64.ActiveCfg = MachineIndependent|x64
202+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|x64.Build.0 = MachineIndependent|x64
203+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
204+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
205+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|Any CPU.ActiveCfg = Release|Any CPU
206+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|Any CPU.Build.0 = Release|Any CPU
207+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|x64.ActiveCfg = Release|x64
208+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|x64.Build.0 = Release|x64
209+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|x86.ActiveCfg = Release|Any CPU
210+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release|x86.Build.0 = Release|Any CPU
211+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|Any CPU.ActiveCfg = Release-MONO|Any CPU
212+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|Any CPU.Build.0 = Release-MONO|Any CPU
213+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|x64.ActiveCfg = Release-MONO|x64
214+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|x64.Build.0 = Release-MONO|x64
215+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
216+
{243181BA-73D1-4B14-BA29-EBB8D183F573}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
185217
EndGlobalSection
186218
GlobalSection(SolutionProperties) = preSolution
187219
HideSolutionNode = FALSE

‎NuGet.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
65

7-
<add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
86
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
97
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
108
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
119
<add key="dotnet-core2" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
12-
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
13-
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
1410
<add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
1511
<add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
1612
<add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
1713

14+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
15+
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
16+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
17+
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1818
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1919

2020
<add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />

‎eng/Packages.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4-
<MicrosoftNetCompilersVersion>3.3.1-beta3-19421-04</MicrosoftNetCompilersVersion>
5-
<CompilerToolsVersion>3.3.1-beta3-19421-04</CompilerToolsVersion>
4+
<MicrosoftNetCompilersVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersVersion>
5+
<CompilerToolsVersion>3.3.1-beta4-19462-11</CompilerToolsVersion>
66
<NuGetPackageVersion>5.3.0-rtm.6192</NuGetPackageVersion>
77
<NuGetBuildTasksVersion Condition="'$(NuGetBuildTasksVersion)' == ''">$(NuGetPackageVersion)</NuGetBuildTasksVersion>
88
<NuGetCommandsVersion Condition="'$(NuGetCommandsVersion)' == ''">$(NuGetPackageVersion)</NuGetCommandsVersion>
@@ -49,8 +49,11 @@
4949
<PackageReference Update="xunit.core" Version="$(XUnitVersion)" />
5050
</ItemGroup>
5151

52-
<ItemGroup>
52+
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
5353
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-004" PrivateAssets="All"/>
54+
</ItemGroup>
55+
56+
<ItemGroup>
5457
<GlobalPackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.15" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
5558
</ItemGroup>
5659

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19426.12">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>36ce21e795e2e90081300f4cb645dfd8cf6eb2b3</Sha>
6+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
77
</Dependency>
88
</ToolsetDependencies>
99
<ProductDependencies>
10-
<Dependency Name="System.Resources.Extensions" Version="4.6.0-rc1.19425.2">
10+
<Dependency Name="System.Resources.Extensions" Version="4.6.0-rc2.19458.3">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
12-
<Sha>7cfc8fc8b202782d3f69db967c733766350706a0</Sha>
12+
<Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
1313
</Dependency>
1414
</ProductDependencies>
1515
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
2222
<!-- Workaround for https://github.com/dotnet/roslyn/issues/35793 -->
2323
<SemanticVersioningV1>true</SemanticVersioningV1>
24+
<MicroBuildPluginsSwixBuildVersion>1.0.672</MicroBuildPluginsSwixBuildVersion>
2425
<MonoBuild Condition="'$(Configuration)' == 'Debug-MONO' or '$(Configuration)' == 'Release-MONO'">true</MonoBuild>
2526
</PropertyGroup>
2627
<!-- Repo Toolset Features -->
@@ -36,7 +37,7 @@
3637
</PropertyGroup>
3738
<!-- Product Dependencies -->
3839
<PropertyGroup>
39-
<SystemResourcesExtensionsVersion>4.6.0-rc1.19425.2</SystemResourcesExtensionsVersion>
40+
<SystemResourcesExtensionsVersion>4.6.0-rc2.19458.3</SystemResourcesExtensionsVersion>
4041
</PropertyGroup>
4142
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
4243
<!-- See https://github.com/dotnet/arcade/issues/3386

‎eng/cibuild_bootstrapped_msbuild.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ if [ $host_type = "mono" ] ; then
7575
export _InitializeBuildTool="mono"
7676
export _InitializeBuildToolCommand="$mono_msbuild_dir/MSBuild.dll"
7777
export _InitializeBuildToolFramework="net472"
78-
export MONO_ENV_OPTIONS="$MONO_ENV_OPTIONS --assembly-loader=strict"
7978

8079
configuration="$configuration-MONO"
8180
extn_path="$mono_msbuild_dir/Extensions"

‎eng/common/build.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ function Build {
8585
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
8686
# Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
8787
[string[]] $msbuildArgs = $properties
88+
89+
# Resolve relative project paths into full paths
90+
$projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
91+
8892
$msbuildArgs += "/p:Projects=$projects"
8993
$properties = $msbuildArgs
9094
}

‎eng/common/darc-init.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4+
$verbosity = "m"
45
)
56

6-
$verbosity = "m"
77
. $PSScriptRoot\tools.ps1
88

99
function InstallDarcCli ($darcVersion) {

‎eng/common/darc-init.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
1823
*)
1924
echo "Invalid argument: $1"
2025
usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
3439
[[ $source != /* ]] && source="$scriptroot/$source"
3540
done
3641
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3842

3943
. "$scriptroot/tools.sh"
4044

0 commit comments

Comments
 (0)