Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/arcade
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3fb1f4b
Choose a base ref
...
head repository: dotnet/arcade
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ffc76a
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Jan 18, 2022

  1. Fix variable initialization error in source-build.yml (#8357)

    @akoeplinger
    akoeplinger authored Jan 18, 2022
    Configuration menu
    Copy the full SHA
    4f445b1 View commit details
    Browse the repository at this point in the history

  2. Update dependencies from https://github.com/dotnet/arcade build 20220… 

    …117.1 (#8356)

[main] Update dependencies from dotnet/arcade
    @dotnet-maestro
    dotnet-maestro[bot] authored Jan 18, 2022
    Configuration menu
    Copy the full SHA
    45cf564 View commit details
    Browse the repository at this point in the history

  3. Fix DotnetSharedFrameworkTaskDir to not rely on DotnetBuildFromSource (… 

    …#8355)

After #8338 we saw a build error in a dotnet/runtime build job that tries to validate source-build but still uses the non-source-built arcade packages:

```
 /__w/1/s/artifacts/source-build/self/src/src/libraries/ref.proj(68,5): error MSB4062: The "CreateFrameworkListFile" task could not be loaded from the assembly /__w/1/s/artifacts/source-build/self/package-cache/microsoft.dotnet.sharedframework.sdk/7.0.0-beta.22064.25/sdk/../tools/net6.0/Microsoft.DotNet.SharedFramework.Sdk.dll. Could not load file or assembly '/__w/1/s/artifacts/source-build/self/package-cache/microsoft.dotnet.sharedframework.sdk/7.0.0-beta.22064.25/tools/net6.0/Microsoft.DotNet.SharedFramework.Sdk.dll'. The system cannot find the file specified.
```

This is because the non-source-built arcade packages use netcoreapp3.1 libraries instead of  net6.0, but we're still setting DotnetBuildFromSource=true in those builds.

Instead of using DotnetBuildFromSource to switch between libraries we can check for the existence of the net6.0 folder which works in both scenarios.
    @akoeplinger
    akoeplinger authored Jan 18, 2022
    Configuration menu
    Copy the full SHA
    9ffc76a View commit details
    Browse the repository at this point in the history
Loading