Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/installer #7217

Merged
merged 18 commits into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
57565bd
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 28, 2022
ed992df
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 29, 2022
b555ded
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 1, 2022
00d3766
Remove leading/trailing spaces from response file
jonathanpeppers Jul 15, 2022
9b533a3
Include *.g.cs file in artifacts
jonathanpeppers Aug 1, 2022
9e5deba
Update Step_CopyExtraResultFilesForCI.cs
jonathanpeppers Aug 1, 2022
1b0465d
Revert "Update Step_CopyExtraResultFilesForCI.cs"
jonathanpeppers Aug 2, 2022
6d020f8
Revert "Include *.g.cs file in artifacts"
jonathanpeppers Aug 2, 2022
239aac3
Merge branch 'main' into darc-main-d18a9e18-18a2-4332-93c3-a4f391da93a1
jonathanpeppers Aug 2, 2022
900f6d9
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 2, 2022
17bc865
Remove `-v:n`?
jonathanpeppers Aug 3, 2022
9b536ce
Revert "Remove `-v:n`?"
jonathanpeppers Aug 3, 2022
eefe470
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=true
jonathanpeppers Aug 3, 2022
ada59e3
Pass along BinaryFormatter warning to BinarySerializableConstraint
jonathanpeppers Aug 3, 2022
e4ee93a
Only mark BinarySerializableConstraint obsolete in .NET
jonathanpeppers Aug 3, 2022
6e780fc
[tests] add one $(NoWarn) for SYSLIB0011
jonathanpeppers Aug 4, 2022
3f3c9c0
DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=true in yaml?
jonathanpeppers Aug 5, 2022
6cf1ac6
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 8, 2022
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ endif

export NO_SUDO ?= false

# Workaround: https://github.com/dotnet/sdk/issues/26965
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER = true

ifneq ($(NO_SUDO),false)
_PREPARE_ARGS += --auto-provisioning-uses-sudo=false
endif
Expand Down
3 changes: 3 additions & 0 deletions build-tools/automation/yaml-templates/variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ variables:
value: net7.0
- name: DotNetStableTargetFramework
value: net6.0
# Workaround: https://github.com/dotnet/sdk/issues/26965
- name: DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER
value: true
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22374.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22407.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>53587f98e132f3c5bc6d2a77d779d6872710d53e</Sha>
<Sha>8f639696e6d57fb09e03e89c6397d913de1231ed</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22368.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>31a57b5762d8aceb4a61cc1e6cf96605cce417f1</Sha>
<Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22367.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>aafa91036e1efd3d4dcb67eeb261cb6d8f774685</Sha>
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22362.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22368.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>11a9acf5ab6fe5a20f0a7d4326c785bd51e9859c</Sha>
<Sha>7b2cd1ee7169143248a7da9fd749caf22affa624</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22374.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22368.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22367.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22407.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22362.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22368.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ public class BinarySerializableConstraint : Constraint
/// <param name="actual">The value to be tested</param>
/// <returns>True for success, false for failure</returns>
[System.Diagnostics.CodeAnalysis.SuppressMessage ("Security", "CA2302: Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize", Justification = "Data to be deserialized is trusted, as we create it in this same method.")]
#if NET
[Obsolete("BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.", DiagnosticId = "SYSLIB0011", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
#endif
public override bool Matches(object actual)
{
this.actual = actual;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,21 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
args.Append ($" @\"{responseFile}\"");
using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) {
sw.WriteLine ("/p:_DisableParallelAot=true");
sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
sw.WriteLine ($"/p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
if (BuildingInsideVisualStudio) {
sw.WriteLine (" /p:BuildingOutOfProcess=true");
sw.WriteLine ("/p:BuildingOutOfProcess=true");
}
string sdkPath = AndroidSdkResolver.GetAndroidSdkPath ();
if (Directory.Exists (sdkPath)) {
sw.WriteLine (" /p:AndroidSdkDirectory=\"{0}\" ", sdkPath);
sw.WriteLine ("/p:AndroidSdkDirectory=\"{0}\"", sdkPath);
}
string jdkPath = AndroidSdkResolver.GetJavaSdkPath ();
if (Directory.Exists (jdkPath)) {
sw.WriteLine (" /p:JavaSdkDirectory=\"{0}\" ", jdkPath);
sw.WriteLine ("/p:JavaSdkDirectory=\"{0}\"", jdkPath);
}
if (parameters != null) {
foreach (var param in parameters) {
sw.WriteLine (" /p:{0}", param);
sw.WriteLine ("/p:{0}", param);
}
}
var msbuildArgs = Environment.GetEnvironmentVariable ("NUNIT_MSBUILD_ARGS");
Expand All @@ -256,7 +256,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
}

psi.SetEnvironmentVariable ("MSBUILD", "msbuild");
sw.WriteLine ($" /bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
sw.WriteLine ($"/bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");

if (environmentVariables != null) {
foreach (var kvp in environmentVariables) {
Expand Down
2 changes: 2 additions & 0 deletions tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,8 @@ public void JsonDeserializationCreatesJavaHandle ([Values (false, true)] bool is
proj = new XamarinAndroidApplicationProject () {
IsRelease = isRelease,
};
// error SYSLIB0011: 'BinaryFormatter.Serialize(Stream, object)' is obsolete: 'BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.'
proj.SetProperty ("NoWarn", "SYSLIB0011");

if (isRelease || !CommercialBuildAvailable) {
proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
Expand Down