Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[master] Update dependencies from dotnet/arcade #24333

Merged
merged 32 commits into from
May 24, 2019
+440 −167
Merged

[master] Update dependencies from dotnet/arcade #24333

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d6c6096
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 1, 2019
426c8b4
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 2, 2019
49ca362
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
jkotas May 2, 2019
8790e31
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 3, 2019
b3f5c1c
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 4, 2019
47169b5
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 5, 2019
381cb13
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 6, 2019
208500a
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
hoyosjs May 6, 2019
25c4ca3
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 7, 2019
fe2fa80
Update Unix permissions
jkotas May 7, 2019
ae7b593
Set the versions same way as CoreFX repo
jkotas May 8, 2019
0b5dd6a
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 8, 2019
8d0843d
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
jkotas May 9, 2019
e5d2d6b
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 9, 2019
8eea62c
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 10, 2019
ce85df6
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
hoyosjs May 22, 2019
92d2641
Reconcile package versions coming from Arcade
hoyosjs May 22, 2019
1902f59
Use SDK 2.2.300; has MSBuild fixes for XML parsing
hoyosjs May 22, 2019
c79b29d
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
jkotas May 23, 2019
02fd570
Fix the product branding version
jkotas May 23, 2019
96674d3
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 23, 2019
8d09a5f
Delete .NET Framework reference assemblies reference
jkotas May 23, 2019
f84d673
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
jkotas May 23, 2019
7680bc0
Add explcit reference for Microsoft.NETCore.Platforms
jkotas May 23, 2019
3b16b92
Correct version
jkotas May 24, 2019
ef22a70
Add workaround to one more place
jkotas May 24, 2019
5650e58
Workaround for https://github.com/dotnet/arcade/issues/2673
jkotas May 24, 2019
729406a
Update dependencies from https://github.com/dotnet/arcade build 20190…
May 24, 2019
30e9fbb
Merge branch 'master' into darc-master-145055cf-390b-45fd-8ad8-3585b3…
jkotas May 24, 2019
2672f9f
Delete redundant line
jkotas May 24, 2019
6560389
Delete redundant subscription
jkotas May 24, 2019
809ed32
Apply the workaround again
jkotas May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add workaround to one more place
  • Loading branch information
@jkotas
jkotas committed May 24, 2019
commit ef22a70c27573e9f166b254f9cf42e71154a689e
1 change: 1 addition & 0 deletions tests/runtest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ $(_XunitEpilog)
<ItemGroup>
<!-- Workaround for https://github.com/dotnet/core-setup/pull/5893 -->
<PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MicrosoftNETCoreAppVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>

<ItemGroup>
Expand Down