Skip to content

[main] Update dependencies from xamarin/xamarin-android #1577

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 25 commits into from
Jul 19, 2021
Merged

[main] Update dependencies from xamarin/xamarin-android #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4a335b4
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 8, 2021
f72e0ab
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Jul 8, 2021
3b3cc0e
Full Android workload has been renamed to android-aot
jonathanpeppers Jul 8, 2021
3e6d2ae
Use shortened Apple platform workload names
jonathanpeppers Jul 8, 2021
62c8954
One more place the android workload name is used
jonathanpeppers Jul 8, 2021
7d5a407
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Jul 8, 2021
3e64450
Use shortened Apple platform workload names
jonathanpeppers Jul 8, 2021
b53ad3e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 10, 2021
ba95823
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Jul 11, 2021
e4189a9
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Jul 13, 2021
7d0b9b6
Merge branch 'darc-main-fbbbe4d1-a3b9-40fc-aace-b22e7d2f69da' into da…
jonathanpeppers Jul 13, 2021
7e0c311
Revert "[build] remove workaround for iOS AOT packages on Windows"
jonathanpeppers Jul 13, 2021
d7212d4
Add NoWarn=CS8032 for Razor
jonathanpeppers Jul 13, 2021
a9643bd
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 14, 2021
032285a
Merge branch 'main' into darc-main-90168b46-91fb-421a-99dc-36cee90a77c6
jonathanpeppers Jul 14, 2021
4399739
Revert "Add NoWarn=CS8032 for Razor"
jonathanpeppers Jul 14, 2021
7285c8d
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 15, 2021
74cd194
Merge remote-tracking branch 'origin/main' into darc-main-90168b46-91…
mattleibow Jul 15, 2021
4135270
Do it like a madman
mattleibow Jul 16, 2021
f23e910
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 16, 2021
a29abb4
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jul 17, 2021
e4a87b7
use the newer sdks
mattleibow Jul 19, 2021
f5bc351
18362
mattleibow Jul 19, 2021
8d6ba1d
use the new path
mattleibow Jul 19, 2021
02bfc34
:)
mattleibow Jul 19, 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
6 changes: 6 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,10 @@
<Content Remove="@(None->WithMetadataValue('Pack','true'))" />
</ItemGroup>

<!-- Until we get a new enough dotnet -->
<ItemGroup>
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.19" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.19" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ NUNIT_TEST_WHERE = ParseDevOpsInputs(NUNIT_TEST_WHERE);
var ANDROID_HOME = EnvironmentVariable("ANDROID_HOME") ??
(IsRunningOnWindows () ? "C:\\Program Files (x86)\\Android\\android-sdk\\" : "");

string MSBuildExe = Argument("msbuild", EnvironmentVariable("MSBUILD_EXE", ""));
string MSBuildArgumentsENV = EnvironmentVariable("MSBuildArguments", "");
string MSBuildArgumentsARGS = Argument("MSBuildArguments", "");
string MSBuildArguments;
Expand Down
88 changes: 44 additions & 44 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.6.21355.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21327.2" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>7f8e0d76c0862f3afab687505b4177d52b42808f</Sha>
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-preview.6.62">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="30.0.100-ci.main.84">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>9a7da6d3e943544abbf67758b50fd5afb21875cc</Sha>
<Sha>24f272bd357d67a5e326d4cce55899a5b98905ae</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.0.100-ci.main.162">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -28,81 +28,81 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>a202354c711b3d0e09e595c3f257b438bc8b3bec</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Primitives" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>02f70d0b903422282cd7ba8037de6b66ea0b7a2d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.WebView" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.JSInterop" Version="6.0.0-preview.7.21325.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2af293dc72625b865fa7fcad5aeb510df46386bd</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21353.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>25aa8d68892fc742ac6ab7bd48813dea9d5c23f7</Sha>
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21352.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21324.24" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>770d630b283ec1be4a8ed41ac78e13ec1fd957b1</Sha>
<Sha>881e90231b93652acde39bea946c6075a71d5ddc</Sha>
</Dependency>
</ProductDependencies>
</Dependencies>
44 changes: 22 additions & 22 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.6.21355.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-preview.6.62</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.7.21326.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>30.0.100-ci.main.84</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.0.100-ci.main.162</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.0.100-ci.main.162</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>15.0.100-ci.main.162</MicrosofttvOSSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.0.100-ci.main.162</MicrosoftmacOSSdkPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-preview.6.21355.2</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-preview.6.21355.2</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-preview.6.21355.2</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.6.21353.1</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-preview.6.21352.12</SystemCodeDomPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-preview.7.21326.8</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0-preview.7.21324.24</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0-preview.7.21325.3</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftAspNetCoreAuthorizationPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAuthorizationPackageVersion>
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
<MicrosoftAspNetCoreComponentsWebPackageVersion>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreComponentsWebPackageVersion>
<MicrosoftJSInteropPackageVersion>6.0.0-preview.7.21325.3</MicrosoftJSInteropPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>6.0.0-preview.7.21325.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftWindowsDesktopAppRuntimewinx64Version>6.0.0-preview.7.21323.1</MicrosoftWindowsDesktopAppRuntimewinx64Version>
<SystemCodeDomPackageVersion>6.0.0-preview.7.21324.24</SystemCodeDomPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Trim all characters after first `-` or `+` is encountered. -->
Expand Down
3 changes: 3 additions & 0 deletions eng/cake/dotnet.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ Task("SAMPLE-MAC")

string FindMSBuild()
{
if (!string.IsNullOrWhiteSpace(MSBuildExe))
return MSBuildExe;

if (IsRunningOnWindows())
{
var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ variables:
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
- name: provisionator.path
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
- name: provisionator.vs2019
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs2019.csx'
- name: provisionator.vs
value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs.csx'
- name: provisionator.extraArguments
value: '--v'
- name: DotNet.Dir
Expand Down
Loading