Skip to content

Commit 46323d1

Browse files
xen2xen2
committed
[Build] Use MSBuild 15.5 from MyGet
 # Original commit: '103d66b8177e75fee0232393d69ee5a87712cbe9'
1 parent a810f9e commit 46323d1

File tree

11 files changed

+44
-34
lines changed

11 files changed

+44
-34
lines changed

‎build/.nuget/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@
33
<solution>
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
6+
<packageSources>
7+
<add key="msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
8+
</packageSources>
9+
<activePackageSource>
10+
<add key="msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
11+
</activePackageSource>
612
</configuration>

‎sources/assets/SiliconStudio.Assets/SiliconStudio.Assets.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
</PropertyGroup>
1818
<ItemGroup>
1919
<Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
20-
<HintPath>..\..\..\build\packages\Microsoft.Build.15.3.409\lib\net46\Microsoft.Build.dll</HintPath>
20+
<HintPath>..\..\..\build\packages\Microsoft.Build.15.5.180\lib\net46\Microsoft.Build.dll</HintPath>
2121
<Private>True</Private>
2222
</Reference>
2323
<Reference Include="Microsoft.Build.Engine, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
24-
<HintPath>..\..\..\build\packages\Microsoft.Build.Engine.15.3.409\lib\net46\Microsoft.Build.Engine.dll</HintPath>
24+
<HintPath>..\..\..\build\packages\Microsoft.Build.Engine.15.5.180\lib\net46\Microsoft.Build.Engine.dll</HintPath>
2525
<Private>True</Private>
2626
</Reference>
2727
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
28-
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.3.409\lib\net46\Microsoft.Build.Framework.dll</HintPath>
28+
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.5.180\lib\net46\Microsoft.Build.Framework.dll</HintPath>
2929
<Private>True</Private>
3030
</Reference>
3131
<Reference Include="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
32-
<HintPath>..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.3.409\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
32+
<HintPath>..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.5.180\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
3333
<Private>True</Private>
3434
</Reference>
3535
<Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
36-
<HintPath>..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.3.409\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
36+
<HintPath>..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.5.180\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="Microsoft.CSharp" />

‎sources/assets/SiliconStudio.Assets/packages.config

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Build" version="15.3.409" targetFramework="net462" />
4-
<package id="Microsoft.Build.Engine" version="15.3.409" targetFramework="net462" />
5-
<package id="Microsoft.Build.Framework" version="15.3.409" targetFramework="net462" />
6-
<package id="Microsoft.Build.Tasks.Core" version="15.3.409" targetFramework="net462" />
7-
<package id="Microsoft.Build.Utilities.Core" version="15.3.409" targetFramework="net462" />
3+
<package id="Microsoft.Build" version="15.5.180" targetFramework="net462" />
4+
<package id="Microsoft.Build.Engine" version="15.5.180" targetFramework="net462" />
5+
<package id="Microsoft.Build.Framework" version="15.5.180" targetFramework="net462" />
6+
<package id="Microsoft.Build.Tasks.Core" version="15.5.180" targetFramework="net462" />
7+
<package id="Microsoft.Build.Utilities.Core" version="15.5.180" targetFramework="net462" />
88
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
99
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
1010
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
@@ -22,5 +22,6 @@
2222
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
2323
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
2424
<package id="System.Threading.Tasks.Dataflow" version="4.6.0" targetFramework="net462" />
25+
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net462" />
2526
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
2627
</packages>

‎sources/common/core/SiliconStudio.Core.Tasks/SiliconStudio.Core.Tasks.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@
3535
<HintPath>..\..\deps\libgit2\LibGit2Sharp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
38-
<HintPath>..\..\..\..\build\packages\Microsoft.Build.15.3.409\lib\net46\Microsoft.Build.dll</HintPath>
38+
<HintPath>..\..\..\..\build\packages\Microsoft.Build.15.5.180\lib\net46\Microsoft.Build.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
42-
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Framework.15.3.409\lib\net46\Microsoft.Build.Framework.dll</HintPath>
42+
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Framework.15.5.180\lib\net46\Microsoft.Build.Framework.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.3.409\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
46+
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.5.180\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
50-
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.3.409\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
50+
<HintPath>..\..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.5.180\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎sources/common/core/SiliconStudio.Core.Tasks/packages.config

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Build" version="15.3.409" targetFramework="net462" />
4-
<package id="Microsoft.Build.Framework" version="15.3.409" targetFramework="net462" />
5-
<package id="Microsoft.Build.Tasks.Core" version="15.3.409" targetFramework="net462" />
6-
<package id="Microsoft.Build.Utilities.Core" version="15.3.409" targetFramework="net462" />
3+
<package id="Microsoft.Build" version="15.5.180" targetFramework="net462" />
4+
<package id="Microsoft.Build.Framework" version="15.5.180" targetFramework="net462" />
5+
<package id="Microsoft.Build.Tasks.Core" version="15.5.180" targetFramework="net462" />
6+
<package id="Microsoft.Build.Utilities.Core" version="15.5.180" targetFramework="net462" />
77
<package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.8.24" targetFramework="net462" developmentDependency="true" />
88
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
99
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
@@ -16,5 +16,6 @@
1616
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
1717
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
1818
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
19+
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net462" />
1920
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
2021
</packages>

‎sources/engine/SiliconStudio.Xenko.Assets/SiliconStudio.Xenko.Assets.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
<HintPath>..\..\..\build\packages\ManagedEsent.1.9.4\lib\net40\Esent.Interop.dll</HintPath>
2323
</Reference>
2424
<Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
25-
<HintPath>..\..\..\build\packages\Microsoft.Build.15.3.409\lib\net46\Microsoft.Build.dll</HintPath>
25+
<HintPath>..\..\..\build\packages\Microsoft.Build.15.5.180\lib\net46\Microsoft.Build.dll</HintPath>
2626
<Private>True</Private>
2727
</Reference>
2828
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
29-
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.3.409\lib\net46\Microsoft.Build.Framework.dll</HintPath>
29+
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.5.180\lib\net46\Microsoft.Build.Framework.dll</HintPath>
3030
<Private>True</Private>
3131
</Reference>
3232
<Reference Include="Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
33-
<HintPath>..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.3.409\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
33+
<HintPath>..\..\..\build\packages\Microsoft.Build.Tasks.Core.15.5.180\lib\net46\Microsoft.Build.Tasks.Core.dll</HintPath>
3434
<Private>True</Private>
3535
</Reference>
3636
<Reference Include="Microsoft.Build.Utilities.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
37-
<HintPath>..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.3.409\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
37+
<HintPath>..\..\..\build\packages\Microsoft.Build.Utilities.Core.15.5.180\lib\net46\Microsoft.Build.Utilities.Core.dll</HintPath>
3838
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="Microsoft.CodeAnalysis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎sources/engine/SiliconStudio.Xenko.Assets/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ManagedEsent" version="1.9.4" targetFramework="net462" />
4-
<package id="Microsoft.Build" version="15.3.409" targetFramework="net462" />
5-
<package id="Microsoft.Build.Framework" version="15.3.409" targetFramework="net462" />
6-
<package id="Microsoft.Build.Tasks.Core" version="15.3.409" targetFramework="net462" />
7-
<package id="Microsoft.Build.Utilities.Core" version="15.3.409" targetFramework="net462" />
4+
<package id="Microsoft.Build" version="15.5.180" targetFramework="net462" />
5+
<package id="Microsoft.Build.Framework" version="15.5.180" targetFramework="net462" />
6+
<package id="Microsoft.Build.Tasks.Core" version="15.5.180" targetFramework="net462" />
7+
<package id="Microsoft.Build.Utilities.Core" version="15.5.180" targetFramework="net462" />
88
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net452" />
99
<package id="Microsoft.CodeAnalysis.Common" version="2.0.0" targetFramework="net462" />
1010
<package id="Microsoft.CodeAnalysis.CSharp" version="2.0.0" targetFramework="net462" />

‎sources/tools/SiliconStudio.Xenko.ConnectionRouter/SiliconStudio.Xenko.ConnectionRouter.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<ItemGroup>
2727
<Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
2828
<SpecificVersion>False</SpecificVersion>
29-
<HintPath>..\..\..\build\packages\Microsoft.Build.15.3.409\lib\net46\Microsoft.Build.dll</HintPath>
29+
<HintPath>..\..\..\build\packages\Microsoft.Build.15.5.180\lib\net46\Microsoft.Build.dll</HintPath>
3030
<Private>True</Private>
3131
</Reference>
3232
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
3333
<SpecificVersion>False</SpecificVersion>
34-
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.3.409\lib\net46\Microsoft.Build.Framework.dll</HintPath>
34+
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.5.180\lib\net46\Microsoft.Build.Framework.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="Mono.Options">

‎sources/tools/SiliconStudio.Xenko.ConnectionRouter/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Build" version="15.3.409" targetFramework="net462" />
4-
<package id="Microsoft.Build.Framework" version="15.3.409" targetFramework="net462" />
3+
<package id="Microsoft.Build" version="15.5.180" targetFramework="net462" />
4+
<package id="Microsoft.Build.Framework" version="15.5.180" targetFramework="net462" />
55
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
66
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
77
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
@@ -12,5 +12,6 @@
1212
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
1313
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
1414
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
15+
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net462" />
1516
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
1617
</packages>

‎sources/tools/SiliconStudio.Xenko.ProjectGenerator/SiliconStudio.Xenko.ProjectGenerator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<ItemGroup>
2525
<Reference Include="Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
2626
<SpecificVersion>False</SpecificVersion>
27-
<HintPath>..\..\..\build\packages\Microsoft.Build.15.3.409\lib\net46\Microsoft.Build.dll</HintPath>
27+
<HintPath>..\..\..\build\packages\Microsoft.Build.15.5.180\lib\net46\Microsoft.Build.dll</HintPath>
2828
<Private>True</Private>
2929
</Reference>
3030
<Reference Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
3131
<SpecificVersion>False</SpecificVersion>
32-
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.3.409\lib\net46\Microsoft.Build.Framework.dll</HintPath>
32+
<HintPath>..\..\..\build\packages\Microsoft.Build.Framework.15.5.180\lib\net46\Microsoft.Build.Framework.dll</HintPath>
3333
<Private>True</Private>
3434
</Reference>
3535
<Reference Include="Mono.Options">

‎sources/tools/SiliconStudio.Xenko.ProjectGenerator/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Build" version="15.3.409" targetFramework="net462" />
4-
<package id="Microsoft.Build.Framework" version="15.3.409" targetFramework="net462" />
3+
<package id="Microsoft.Build" version="15.5.180" targetFramework="net462" />
4+
<package id="Microsoft.Build.Framework" version="15.5.180" targetFramework="net462" />
55
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
66
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
77
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
@@ -12,5 +12,6 @@
1212
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
1313
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
1414
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
15+
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net462" />
1516
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
1617
</packages>

0 commit comments

Comments
 (0)