Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.103-servicing.26065.102">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.200-preview.0.26077.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
<Sha>2047768c55865642b1b930bbc6e1260825ace624</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26065.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down Expand Up @@ -40,13 +40,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26065.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26077.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
<Sha>2047768c55865642b1b930bbc6e1260825ace624</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.103">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.200-preview.26077.126">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>99f9e99f92d73ade5453ba8edba5d72247f3cd11</Sha>
<Sha>2047768c55865642b1b930bbc6e1260825ace624</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.103-servicing.26065.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.200-preview.0.26077.126</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26065.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26065.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26077.126</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.103</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.200-preview.26077.126</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26065.102</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
Expand All @@ -24,9 +24,9 @@
<VersionSuffixRegex>\-(preview|rc|alpha).\d+</VersionSuffixRegex>
<DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex)))</DotNetPreviewVersionBand>
<DotNetSdkManifestsFolder>$(DotNetPreviewVersionBand)</DotNetSdkManifestsFolder>
<DotNetMonoManifestVersionBand>$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadMonoToolChainPackageVersion), $(VersionSuffixRegex)))</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex)))</DotNetEmscriptenManifestVersionBand>
<!-- NOTE: sometimes we hardcode this when transitioning to new version bands -->
<DotNetAndroidManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetAndroidManifestVersionBand>
<!-- NOTE: sometimes we hardcode these when transitioning to new version bands -->
<DotNetMonoManifestVersionBand>10.0.100</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>10.0.100</DotNetEmscriptenManifestVersionBand>
<DotNetAndroidManifestVersionBand>10.0.100</DotNetAndroidManifestVersionBand>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
Condition=" $([MSBuild]::VersionLessThanOrEquals($(TargetFrameworkVersion), '8.0')) " />
</ImportGroup>

<!-- Workaround for: https://github.com/dotnet/android/issues/10722 -->
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<UseDefaultPublishRuntimeIdentifier Condition=" '$(UseDefaultPublishRuntimeIdentifier)' == '' ">false</UseDefaultPublishRuntimeIdentifier>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) ">
<KnownFrameworkReference
Update="Microsoft.Android"
Expand Down