diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96240ca7b9ba..f0c4d17b2af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,41 +1,5 @@ - - https://github.com/dotnet/installer - e6dd91c290b808f971a1ac69c2fb29395bbf1051 - - - https://github.com/dotnet/runtime - d25158d0dffd699340cedcfd43324c87a809a214 - - - https://github.com/xamarin/xamarin-android - 8f1d9a47205ead80132661f68b0cee9ed0e0220b - - - https://github.com/xamarin/xamarin-macios - d06856ad79b9fb77de944b3f59a1fc799964a496 - - - https://github.com/xamarin/xamarin-macios - d06856ad79b9fb77de944b3f59a1fc799964a496 - - - https://github.com/xamarin/xamarin-macios - d06856ad79b9fb77de944b3f59a1fc799964a496 - - - https://github.com/xamarin/xamarin-macios - d06856ad79b9fb77de944b3f59a1fc799964a496 - - - https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 - - - https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 - https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index f0c45fe6a337..3c4f8512ab91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.547 - 7.0.100-rtm.22519.39 + 7.0.1xx - 7.0.0-rtm.22511.4 + 7.0.2 7.0.0 7.0.0 7.0.0 - 33.0.4 + 33.0.26 16.2.1024 13.1.1024 @@ -20,8 +20,7 @@ 7.0.100 - 7.0.0-rtm.22504.3 - $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) + 7.0.2 1.2.230118.102 10.0.22621.755 diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj index 73af4f3e7f83..6a9d27b73fae 100644 --- a/src/DotNet/DotNet.csproj +++ b/src/DotNet/DotNet.csproj @@ -5,12 +5,15 @@ true https://dotnetbuilds.blob.core.windows.net/internal https://dotnetbuilds.blob.core.windows.net/public + ga https://dot.net/v1/dotnet-install.ps1 dotnet-install.ps1 $(DotNetOutputPath)$(DotNetInstallScriptName) - & '$(DotNetInstallScriptPath)' -Version $(MicrosoftDotnetSdkInternalPackageVersion) -InstallDir '$(DotNetDirectory)' -Verbose + & '$(DotNetInstallScriptPath)' -InstallDir '$(DotNetDirectory)' -Verbose + $(DotNetInstallCommand) -Channel $(MicrosoftDotnetSdkInternalPackageVersion) -Quality $(DotNetChannelQuality) + $(DotNetInstallCommand) -Version $(MicrosoftDotnetSdkInternalPackageVersion) $(DotNetInstallCommand) -AzureFeed $(DotNetFeedUrl) $(DotNetInstallCommand) -AzureFeed $(InternalAzureFeed) -FeedCredential $env:DOTNET_TOKEN powershell -ExecutionPolicy ByPass -NoProfile -Command "$(DotNetInstallCommand)" @@ -19,7 +22,9 @@ https://dot.net/v1/dotnet-install.sh dotnet-install.sh $(DotNetOutputPath)$(DotNetInstallScriptName) - bash '$(DotNetInstallScriptPath)' --version $(MicrosoftDotnetSdkInternalPackageVersion) --install-dir '$(DotNetDirectory)' --verbose + bash '$(DotNetInstallScriptPath)' --install-dir '$(DotNetDirectory)' --verbose + $(DotNetInstallCommand) --channel $(MicrosoftDotnetSdkInternalPackageVersion) --quality $(DotNetChannelQuality) + $(DotNetInstallCommand) --version $(MicrosoftDotnetSdkInternalPackageVersion) $(DotNetInstallCommand) --azure-feed $(InternalAzureFeed) --feed-credential $DOTNET_TOKEN $(DotNetInstallCommand) --azure-feed $(DotNetFeedUrl) @@ -75,7 +80,7 @@ - + @@ -168,7 +173,7 @@ Inputs="$(_Inputs)" Outputs="$(DotNetPacksDirectory).stamp">