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

Merge remote-tracking branch 'origin/master' into xplat-master #139

Merged
merged 42 commits into from
Sep 20, 2019

Conversation

radical
Copy link
Member

@radical radical commented Sep 17, 2019

.. and Merge remote-tracking branch 'mm/mono-2019-06' into xplat-master

v-zbsail and others added 30 commits August 30, 2019 11:45
LOC CHECKIN | Microsoft/msbuild vs16.3 | 20190830
<MicrosoftNetCompilersVersion>3.3.1-beta3-19423-01</MicrosoftNetCompilersVersion>
<CompilerToolsVersion>3.3.1-beta3-19423-01</CompilerToolsVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-rc1.19453.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>3.0.0-preview9.19455.12</MicrosoftNETSdkRazorPackageVersion>
<MicrosoftNETSdkWebPackageVersion>3.0.100-rc1.19455.5</MicrosoftNETSdkWebPackageVersion>
…net#4702)

Set DependentUpon to filename only.

This matches the old convention. Fixes dotnet#4695.
* Update dependencies from https://github.com/dotnet/arcade build 20190908.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
* Update dependencies from https://github.com/dotnet/arcade build 20190827.8

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19427.8

* Update dependencies from https://github.com/dotnet/arcade build 20190828.9

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19428.9

* Update dependencies from https://github.com/dotnet/arcade build 20190829.16

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19429.16

* Update dependencies from https://github.com/dotnet/arcade build 20190830.3

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19430.3

* Update dependencies from https://github.com/dotnet/arcade build 20190903.5

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19453.5

* Update dependencies from https://github.com/dotnet/arcade build 20190904.31

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19454.31

* Update dependencies from https://github.com/dotnet/arcade build 20190905.21

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19455.21

* Update dependencies from https://github.com/dotnet/arcade build 20190906.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.2

* Update dependencies from https://github.com/dotnet/arcade build 20190906.10

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19456.10

* Update dependencies from https://github.com/dotnet/arcade build 20190907.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19457.1

* Update dependencies from https://github.com/dotnet/arcade build 20190908.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
Fixes dotnet#4714 by not setting LastWriteTime on imported project files. Now that we know that this is an operation that can fail, it doesn't seem worth the risk to attempt to preserve the information.
* Using ngenApplications to have MSBuild ngened twice: once for vsn.exe and once for msbuild.exe.

* Updating MicroBuilds's swix plugin to a version that supports ngenApplications.

* Updating microbuild plugin version to 1.0.672.
A case difference between `Microsoft` and `microsoft` is failing builds that attempt to consume OptProf data (published to `Microsoft) from a build that thinks it's connected to `microsoft`. Hard-coding the capitalized version.
…912.3 (dotnet#4722)

- System.Resources.Extensions - 4.6.0-rc2.19462.3
…912.1 (dotnet#4723)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19462.1
dotnet#4673)

* Support for external project collections linking. Add object model remoting API for MSBuild

* Object Model Remoting: New *Link* API

* Object Model Remoting: Accomodation change

* Object Model Remoting: Test coverage

* Object Model Remoting: Automodified by tools

* Feedback

* Move using out of namespace to match other files style.

* Change case on LinkedProjectCollection_Tests.cs

* Add individual read-only tests for evaluation links.
…913.1 (dotnet#4732)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19463.1
* Update dependencies from https://github.com/dotnet/corefx build 20190828.2

- System.Resources.Extensions - 4.6.0-rc1.19428.2

* Update dependencies from https://github.com/dotnet/corefx build 20190908.3

- System.Resources.Extensions - 4.6.0-rc2.19458.3
.. our `RestoreSourcesOverrides.props`, because this is used for
fetching msbuild SDKs.

The `dotnet/toolset` repo has to do the same thing, but not msbuild.
Since, we bundle SDKs we have this additional requirement and so we are
copying over the newly added source from
https://github.com/dotnet/toolset/blob/4e1936a575cdeddf29fd1662a77216f2ea05800b/NuGet.config#L11 .

The above commit hash is what the updates are being based off of (see
previous commits).
radical and others added 11 commits September 16, 2019 18:16
```
commit 3609949
Author: Larry Ewing <[email protected]>
Date:   Mon Sep 16 16:09:18 2019 -0500

    [mono-2019-06] bump versions to rc2
```
* Update dependencies from https://github.com/dotnet/arcade build 20190911.7

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7
[mono-2019-06] bump versions to rc2
This situation can occur on fresh VS 16.3 installs, which install the .NET 4.8 SDK
but don't yet have dotnet#4690 and so still look for tlbimp in the .NET 4.6.2 SDK.
From the internal bug
http://vstfdevdiv:8080/DevDiv/Dev10/_workitems/edit/564085

(December 19, 2009)

> The issue here is the new requirement to automatically add an explicit
reference to mscorlib for C# projects. When doing so, the reference
resolution considers files in the "CandidateAssemblyFiles" set which
includes those items in the project that are to be copied to the output
location.

> The solution here is to pre-resolve the mscorlib path and pass that to
 RAR rather than an unresolved assembly name.
…ames (dotnet#4599)

* Clarify documentation in ProjectGraph.GetTargetLists

* ProjectGraph.GetTargetLists throws on empty target names

* clarify test project contents

* specify method in error message
…tamp

Stop setting LastWriteTime for binlog imports
…et#138)

* [mono] Workaround for the assumption that `dotnet` is installed

We moved to building purely with mono, earlier and thus skip the dotnet
installation in the scripts. This breaks that. Fixing it up in-place for
now.

Commit 2: (Patch on behalf of Alexander Köplinger)
Also, fix the command line, as the `dotnet nuget` uses a different
command line syntax than the standalone `nuget` that mono bundles.

    `nuget locals http-cache -c` -> `nuget locals http-cache -Clear`

* [mono] Workaround: Clear nuget http-cache, if we can

To work around dotnet/arcade#3932 , `nuget
locals http-cache -Clear` is invoked, but in our CI, `nuget` doesn't
seem to be installed in bockbuild's staged prefix.

So, instead we do that only if `dotnet` is available.
Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably update the versions to 3.1.xx but lets get this in

@radical radical merged commit 5ef648c into mono:xplat-master Sep 20, 2019
@radical radical deleted the master-update branch September 20, 2019 21:41
radical added a commit to radical/mono that referenced this pull request Sep 21, 2019
radical added a commit to radical/mono that referenced this pull request Sep 24, 2019
akoeplinger pushed a commit to mono/mono that referenced this pull request Sep 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.