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

Commits on Aug 30, 2019

  1. Configuration menu
    Copy the full SHA
    4765efe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    402e2a1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1df2164 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. Merge pull request dotnet#4679 from v-zbsail/loc_20190830_vs16.3

    LOC CHECKIN | Microsoft/msbuild vs16.3 | 20190830
    Peter Huene authored Sep 5, 2019
    Configuration menu
    Copy the full SHA
    4a2d771 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2019

  1. Update the 3.0.100p9 versions

    <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>
    lewing committed Sep 6, 2019
    Configuration menu
    Copy the full SHA
    4f234cf View commit details
    Browse the repository at this point in the history
  2. Support convention-based DependentUpon for resx files in folders (dot…

    …net#4702)
    
    Set DependentUpon to filename only.
    
    This matches the old convention. Fixes dotnet#4695.
    rainersigwald authored Sep 6, 2019
    Configuration menu
    Copy the full SHA
    ee8294b View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Merge pull request dotnet#134 from mono/bump-p9-versions

    Update the 3.0.100p9 versions
    lewing authored Sep 9, 2019
    Configuration menu
    Copy the full SHA
    da00a8b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b98a6f0 View commit details
    Browse the repository at this point in the history
  3. [vs16.3] Update dependencies from dotnet/arcade (dotnet#4666)

    * Update dependencies from https://github.com/dotnet/arcade build 20190908.2
    
    - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19458.2
    dotnet-maestro[bot] authored and rainersigwald committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    eb1acfc View commit details
    Browse the repository at this point in the history
  4. [master] Update dependencies from dotnet/arcade (dotnet#4672)

    * 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
    dotnet-maestro[bot] authored Sep 9, 2019
    Configuration menu
    Copy the full SHA
    e460c00 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Configuration menu
    Copy the full SHA
    b4a9a96 View commit details
    Browse the repository at this point in the history
  2. Merge pull request dotnet#135 from mono/bump-rc1-versions

    Bump the versions to toolset 8d4c190
    lewing authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    63cdc90 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a33e19e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c8facd View commit details
    Browse the repository at this point in the history
  5. Merge pull request dotnet#4710 from nguerrera/accept-source-build-pat…

    …ches
    
    Accept source build patches
    nguerrera authored Sep 10, 2019
    Configuration menu
    Copy the full SHA
    30da325 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Stop setting LastWriteTime for binlog imports

    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.
    rainersigwald committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    9427b0c View commit details
    Browse the repository at this point in the history
  2. Ngen twice (dotnet#4675)

    * 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.
    Livar authored Sep 11, 2019
    Configuration menu
    Copy the full SHA
    972407a View commit details
    Browse the repository at this point in the history
  3. Hard code RepositoryName=Microsoft/msbuild (dotnet#4719)

    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.
    rainersigwald authored Sep 11, 2019
    Configuration menu
    Copy the full SHA
    72542aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cb1e0df View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2019

  1. Configuration menu
    Copy the full SHA
    3df3d9b View commit details
    Browse the repository at this point in the history
  2. Update dependencies from https://github.com/dotnet/corefx build 20190…

    …912.3 (dotnet#4722)
    
    - System.Resources.Extensions - 4.6.0-rc2.19462.3
    dotnet-maestro[bot] authored Sep 12, 2019
    Configuration menu
    Copy the full SHA
    13fa943 View commit details
    Browse the repository at this point in the history
  3. Update dependencies from https://github.com/dotnet/arcade build 20190…

    …912.1 (dotnet#4723)
    
    - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19462.1
    dotnet-maestro[bot] authored Sep 12, 2019
    Configuration menu
    Copy the full SHA
    cfa47f9 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2019

  1. Update dependencies from https://github.com/dotnet/corefx build 20190…

    …912.14 (dotnet#4727)
    
    - System.Resources.Extensions - 4.6.0
    dotnet-maestro[bot] authored and mmitche committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    84991ba View commit details
    Browse the repository at this point in the history
  2. Support for external project collections linking. Add object model re… (

    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.
    svetkereMS authored and Livar committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    1adb5c5 View commit details
    Browse the repository at this point in the history
  3. Update dependencies from https://github.com/dotnet/arcade build 20190…

    …913.1 (dotnet#4732)
    
    - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19463.1
    dotnet-maestro[bot] authored and mmitche committed Sep 13, 2019
    Configuration menu
    Copy the full SHA
    2374346 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0f4c62f View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2019

  1. [master] Update dependencies from dotnet/corefx (dotnet#4686)

    * 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
    dotnet-maestro[bot] authored and mmitche committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    9c244d1 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Configuration menu
    Copy the full SHA
    3609949 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f5824d6 View commit details
    Browse the repository at this point in the history
  3. [mono] Add aspnetcore-tooling source from dotnet/toolset to ..

    .. 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 committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    f0c497d View commit details
    Browse the repository at this point in the history
  4. [mono] Update Razor SDK version to 3.0.0 as intended in the rc2 update

    ```
    commit 3609949
    Author: Larry Ewing <[email protected]>
    Date:   Mon Sep 16 16:09:18 2019 -0500
    
        [mono-2019-06] bump versions to rc2
    ```
    radical committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    643f670 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. [master] Update dependencies from dotnet/arcade (dotnet#4708)

    * Update dependencies from https://github.com/dotnet/arcade build 20190911.7
    
    - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19461.7
    dotnet-maestro[bot] authored and rainersigwald committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    9918eb7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request dotnet#136 from mono/bump-rc2-versions

    [mono-2019-06] bump versions to rc2
    lewing authored Sep 17, 2019
    Configuration menu
    Copy the full SHA
    d3e6fe8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d144ba3 View commit details
    Browse the repository at this point in the history
  4. Better error when tlbexp isn't found (dotnet#4698)

    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.
    rainersigwald authored Sep 17, 2019
    Configuration menu
    Copy the full SHA
    99fdaba View commit details
    Browse the repository at this point in the history
  5. Clarify comment on _ExplicitReference (dotnet#4688)

    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.
    rainersigwald authored Sep 17, 2019
    Configuration menu
    Copy the full SHA
    b531188 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    037db14 View commit details
    Browse the repository at this point in the history
  7. [Static Graph] ProjectGraph.GetTargetLists throws on invalid target n…

    …ames (dotnet#4599)
    
    * Clarify documentation in ProjectGraph.GetTargetLists
    
    * ProjectGraph.GetTargetLists throws on empty target names
    
    * clarify test project contents
    
    * specify method in error message
    cdmihai authored and rainersigwald committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    2bf1ee7 View commit details
    Browse the repository at this point in the history
  8. Merge pull request dotnet#4715 from rainersigwald/binlog-import-times…

    …tamp
    
    Stop setting LastWriteTime for binlog imports
    rainersigwald authored Sep 17, 2019
    Configuration menu
    Copy the full SHA
    7244393 View commit details
    Browse the repository at this point in the history
  9. [mono] Workaround for the assumption that dotnet is installed (dotn…

    …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.
    radical authored Sep 17, 2019
    Configuration menu
    Copy the full SHA
    8cfbe97 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    498b78e View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. Configuration menu
    Copy the full SHA
    e31ea85 View commit details
    Browse the repository at this point in the history