Skip to content

Bump to dotnet/installer/release/6.0.1xx-preview7@456900d 6.0.100-preview.7.21372.19 #6112

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jul 23, 2021
Merged

Bump to dotnet/installer/release/6.0.1xx-preview7@456900d 6.0.100-preview.7.21372.19 #6112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34630dd
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 21, 2021
4266353
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 22, 2021
f13777b
[xaprepare] don't install microsoft-net-runtime-android workload
jonathanpeppers Jul 22, 2021
bcd0921
Merge branch 'release/6.0.1xx-preview7' into darc-release/6.0.1xx-pre…
jonpryor Jul 22, 2021
82984e8
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jul 23, 2021
45ce890
[tests] fix test to ignore the refint directory
jonathanpeppers Jul 23, 2021
d1074e3
[tests] we don't need to check if Clean deletes directories
jonathanpeppers Jul 23, 2021
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21369.5">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21372.19">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>808795cca8cfaa143ef556cac0dc40d15d2dc186</Sha>
<Sha>456900dd18975ff48c3152248428a7c07e81c4ee</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21365.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>9ecf5bd2809f93d98c1dbea640790ca5a88d35ec</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21368.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21371.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8d3afa3a4a42021be024ffa4a1dee77e35d33911</Sha>
<Sha>743bd894c40b00b93e805db9d62664c915e0c0ee</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21369.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21372.19</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21365.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21368.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21371.11</MicrosoftNETCoreAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->
Expand Down
7 changes: 0 additions & 7 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,6 @@ public void CleanBasicBindingLibrary (string classParser)
};
var files = Directory.GetFiles (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories)
.Where (x => !ignoreFiles.Any (i => !Path.GetFileName (x).Contains (i)));
var directories = Directory.GetDirectories (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories)
// designtime folder is left behind, so Intellisense continues to work after a Clean
.Where (x => Path.GetFileName (x) != "designtime")
// .NET 5+ sets $(ProduceReferenceAssembly) by default
// https://github.com/dotnet/sdk/blob/18ee4eac8b3abe6d554d2e0c39d8952da0f23ce5/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets#L242-L244
.Where (x => Path.GetFileName (x) != "ref");
CollectionAssert.IsEmpty (directories, $"{proj.IntermediateOutputPath} should have no directories.");
CollectionAssert.IsEmpty (files, $"{proj.IntermediateOutputPath} should have no files.");
}
}
Expand Down