stride3d
/
stride
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[build] update msbuild to 16.11.0 from 16.0.461 

was hoping it would help resolve build hanging issues.   It might have helped but was not a solution.
This commit is contained in:
jasons 2021-09-01 19:18:50 -07:00
Родитель 79b89c15f6
Коммит acd969ac88
19 изменённых файлов: 53 добавлений и 45 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
build/KillMSBuild.bat
Просмотреть файл

@ -1 +1,2 @@
taskkill /IM MSBuild.exe /F
taskkill /T /F /IM MSBuild.exe
taskkill /T /F /IM VBCSCompiler.exe

4
build/Stride.Runtime.sln
Просмотреть файл

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.352
# Visual Studio Version 17
VisualStudioVersion = 17.0.31612.314
MinimumVisualStudioVersion = 16.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
EndProject

2
deps/Stride.GitVersioning/Stride.GitVersioning.csproj поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
<TargetFrameworks>net472</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="LibGit2Sharp" Version="0.25.3" />
</ItemGroup>
</Project>

2
deps/Stride.MSBuild.Tasks/Stride.MSBuild.Tasks.csproj поставляемый
Просмотреть файл

@ -3,7 +3,7 @@
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
</ItemGroup>
<UsingTask

20
deps/Stride.MSBuild.Tasks/bin/Release/netstandard2.0/Stride.MSBuild.Tasks.deps.json поставляемый
Просмотреть файл

@ -9,22 +9,22 @@
".NETStandard,Version=v2.0/": {
"Stride.MSBuild.Tasks/1.0.0": {
"dependencies": {
"Microsoft.Build.Utilities.Core": "16.0.461",
"Microsoft.Build.Utilities.Core": "16.11.0",
"NETStandard.Library": "2.0.3"
},
"runtime": {
"Stride.MSBuild.Tasks.dll": {}
}
},
"Microsoft.Build.Framework/16.0.461": {
"Microsoft.Build.Framework/16.11.0": {
"dependencies": {
"System.Runtime.Serialization.Primitives": "4.1.1",
"System.Threading.Thread": "4.0.0"
}
},
"Microsoft.Build.Utilities.Core/16.0.461": {
"Microsoft.Build.Utilities.Core/16.11.0": {
"dependencies": {
"Microsoft.Build.Framework": "16.0.461",
"Microsoft.Build.Framework": "16.11.0",
"Microsoft.Win32.Registry": "4.3.0",
"System.Collections.Immutable": "1.5.0",
"System.Text.Encoding.CodePages": "4.0.1"
@ -183,19 +183,19 @@
"serviceable": false,
"sha512": ""
},
"Microsoft.Build.Framework/16.0.461": {
"Microsoft.Build.Framework/16.11.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-A7krf1sxJn7BsQDz5qHU8QLMu55JaZkF7bfNYP3EVlzi4IbEArnMBCuNP9gR93LpT2XdCBzSBtXc50m6u2N9Kw==",
"path": "microsoft.build.framework/16.0.461",
"hashPath": "microsoft.build.framework.16.0.461.nupkg.sha512"
"path": "microsoft.build.framework/16.11.0",
"hashPath": "microsoft.build.framework.16.11.0.nupkg.sha512"
},
"Microsoft.Build.Utilities.Core/16.0.461": {
"Microsoft.Build.Utilities.Core/16.11.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-1CBsIGirCn4iu/2P2bh1sbbuREJ+RziwQyexQx4n2qIVgrxGb6CNLJun4jW8SG4PRoIeoQvY+VdhhHzxRscQQA==",
"path": "microsoft.build.utilities.core/16.0.461",
"hashPath": "microsoft.build.utilities.core.16.0.461.nupkg.sha512"
"path": "microsoft.build.utilities.core/16.11.0",
"hashPath": "microsoft.build.utilities.core.16.11.0.nupkg.sha512"
},
"Microsoft.NETCore.Platforms/1.1.0": {
"type": "package",

6
sources/assets/Stride.Core.Assets.Quantum/Stride.Core.Assets.Quantum.csproj
Просмотреть файл

@ -13,9 +13,9 @@
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />

6
sources/assets/Stride.Core.Assets/Stride.Core.Assets.csproj
Просмотреть файл

@ -11,11 +11,11 @@
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<!-- Needed by MSBuild to function properly with .NET Core (when creating CreateAppHost task) -->
<PackageReference Include="Microsoft.NET.HostModel" Version="3.1.5" />
<PackageReference Include="Microsoft.NET.HostModel" Version="5.0.0-preview.1.20120.5" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
</ItemGroup>

20
sources/buildengine/Stride.Core.BuildEngine.Common/StrideServiceWireSerializer.cs
Просмотреть файл

@ -5,7 +5,8 @@ using System.IO;
using System.Runtime.Serialization;
using System.Text;
using System.Xml;
using Newtonsoft.Json;
//using Newtonsoft.Json;
using System.Text.Json;
using ServiceWire;
using Stride.Core.Serialization;
using Stride.Core.Serialization.Contents;
@ -66,16 +67,21 @@ namespace Stride.Core.BuildEngine
public class NewtonsoftSerializer : ISerializer
{
private JsonSerializerSettings settings = new JsonSerializerSettings
//private JsonSerializerSettings settings = new JsonSerializerSettings
//{
// ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore
//};
private JsonSerializerOptions settings = new JsonSerializerOptions
{
ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore
ReferenceHandler = System.Text.Json.Serialization.ReferenceHandler.IgnoreCycles
};
public T Deserialize<T>(byte[] bytes)
{
if (null == bytes || bytes.Length == 0) return default(T);
var json = Encoding.UTF8.GetString(bytes);
return JsonConvert.DeserializeObject<T>(json, settings);
return JsonSerializer.Deserialize<T>(json, settings); //return JsonConvert.DeserializeObject<T>(json, settings);
}
public object Deserialize(byte[] bytes, string typeConfigName)
@ -84,13 +90,13 @@ namespace Stride.Core.BuildEngine
var type = typeConfigName.ToType();
if (null == typeConfigName || null == bytes || bytes.Length == 0) return type.GetDefault();
var json = Encoding.UTF8.GetString(bytes);
return JsonConvert.DeserializeObject(json, type, settings);
return JsonSerializer.Deserialize(json,type, settings); //return JsonConvert.DeserializeObject(json, type, settings);
}
public byte[] Serialize<T>(T obj)
{
if (null == obj) return null;
var json = JsonConvert.SerializeObject(obj, settings);
var json = JsonSerializer.Serialize(obj, settings); //JsonConvert.SerializeObject(obj, settings);
return Encoding.UTF8.GetBytes(json);
}
@ -98,7 +104,7 @@ namespace Stride.Core.BuildEngine
{
if (null == obj) return null;
var type = typeConfigName.ToType();
var json = JsonConvert.SerializeObject(obj, type, settings);
var json = JsonSerializer.Serialize(obj, type, settings); //JsonConvert.SerializeObject(obj, type, settings);
return Encoding.UTF8.GetBytes(json);
}
}

2
sources/core/Stride.Core.Design/Stride.Core.Design.csproj
Просмотреть файл

@ -28,7 +28,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<!-- <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> -->
<PackageReference Include="NuGet.Configuration" Version="6.0.0-preview.3" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="System.Management" Version="4.7.0" />

6
sources/core/Stride.Core.Tasks/Stride.Core.Tasks.csproj
Просмотреть файл

@ -20,14 +20,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\deps\libgit2\LibGit2Sharp.dll</HintPath>
</Reference>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e">
<EmbedInteropTypes>True</EmbedInteropTypes>
</PackageReference>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />

2
sources/editor/Stride.Assets.Presentation/Stride.Assets.Presentation.csproj
Просмотреть файл

@ -15,7 +15,7 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="AvalonEdit" Version="6.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />

2
sources/editor/Stride.Core.Assets.Editor/Stride.Core.Assets.Editor.csproj
Просмотреть файл

@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dirkster.AvalonDock" Version="4.10.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />

4
sources/editor/Stride.Editor/Stride.Editor.csproj
Просмотреть файл

@ -12,8 +12,8 @@
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />

6
sources/engine/Stride.Assets/Stride.Assets.csproj
Просмотреть файл

@ -13,8 +13,8 @@
<DefineConstants>STRIDE_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
<!--PackageReference Include="Esent.Interop" Version="1.9.4" /-->
<PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" />
@ -22,7 +22,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.4.0" />
<PackageReference Include="SSH.NET" Version="2016.1.0" />
<PackageReference Include="System.AppContext" Version="4.3.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Collections.Immutable" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />

2
sources/shared/Stride.NuGetResolver/NuGetAssemblyResolver.cs
Просмотреть файл

@ -10,7 +10,7 @@ using System.Runtime.Versioning;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
//using Newtonsoft.Json.Linq;
using NuGet.Commands;
using NuGet.Common;
using NuGet.Configuration;

2
sources/shared/Stride.NuGetResolver/Stride.NuGetResolver.projitems
Просмотреть файл

@ -30,7 +30,7 @@
<Target Name="IncludeNuGetResolverAssemblies">
<ItemGroup>
<BuildOutputInPackage Include="$(OutputPath)NuGet*.dll" />
<BuildOutputInPackage Include="$(OutputPath)Newtonsoft.Json.dll" />
<!-- <BuildOutputInPackage Include="$(OutputPath)Newtonsoft.Json.dll" /> -->
</ItemGroup>
</Target>
<!-- If .NET Core, we embed a loader which will resolve the nuget packages for us -->

3
sources/tools/Stride.NuGetLoader/Stride.NuGetLoader.csproj
Просмотреть файл

@ -20,7 +20,8 @@
<ItemGroup>
<PackageReference Include="NuGet.PackageManagement" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Resolver" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
<ItemGroup>

2
sources/tools/Stride.ProjectGenerator/Stride.ProjectGenerator.csproj
Просмотреть файл

@ -15,7 +15,7 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
</ItemGroup>
<ItemGroup>

4
sources/tools/Stride.VisualStudio.Package/Stride.VisualStudio.Package.csproj
Просмотреть файл

@ -33,8 +33,8 @@
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.0.25023" />
<PackageReference Include="VSLangProj" Version="7.0.3301" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.0.26201" />
<PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" ExcludeAssets="runtime" />
<PackageReference Include="NuGet.Commands" Version="6.0.0-preview.3" />
<Reference Include="System.ComponentModel.Composition" />