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.

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

Jump to bottom

[main] Update dependencies from dotnet/installer #6653

Merged
merged 8 commits into from
Jan 25, 2022
Merged

[main] Update dependencies from dotnet/installer #6653

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
adec60b
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 19, 2022
e8be52e
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 20, 2022
b1b1e69
[build] specify --azure-feed
jonathanpeppers Jan 5, 2022
0d5f034
Merge branch 'main' into darc-main-10e67bf4-458a-4030-9a54-e8f00bd5721a
jonathanpeppers Jan 20, 2022
b17aa98
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 22, 2022
5ed517e
Revert "[build] specify --azure-feed"
jonathanpeppers Jan 24, 2022
1e4ba1a
Merge branch 'main' into darc-main-10e67bf4-458a-4030-9a54-e8f00bd5721a
jonathanpeppers Jan 24, 2022
4a2be2a
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Jan 25, 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
18 changes: 15 additions & 3 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,30 @@ async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string
var type = runtimeOnly ? "runtime" : "SDK";
Log.StatusLine ($"Installing dotnet {type} '{version}'...");

//TODO: temporarily specify the feed until we get:
// https://github.com/dotnet/install-scripts/issues/229
var feed = "https://dotnetbuilds.blob.core.windows.net/public";
if (Context.IsWindows) {
var args = new List<string> {
"-NoProfile", "-ExecutionPolicy", "unrestricted", "-file", dotnetScriptPath,
"-Version", version, "-InstallDir", dotnetPath, "-Verbose"
"-NoProfile",
"-ExecutionPolicy", "unrestricted",
"-file", dotnetScriptPath,
"-Version", version,
"-InstallDir", dotnetPath,
"-AzureFeed", feed,
"-Verbose"
};
if (runtimeOnly)
args.AddRange (new string [] { "-Runtime", "dotnet" });

return Utilities.RunCommand ("powershell.exe", args.ToArray ());
} else {
var args = new List<string> {
dotnetScriptPath, "--version", version, "--install-dir", dotnetPath, "--verbose"
dotnetScriptPath,
"--version", version,
"--install-dir", dotnetPath,
"--azure-feed", feed,
"--verbose"
};
if (runtimeOnly)
args.AddRange (new string [] { "-Runtime", "dotnet" });
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-preview.22063.5">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-preview.22069.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>2d72e717b3ffe4e6094d153a9cc970da971ed753</Sha>
<Sha>c90f7a2280db25b4284dd11ae9239d8a4aa357ae</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-preview.22063.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-preview.22069.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-1.21519.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
Expand Down