Skip to content
Merged
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
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-b0f34d51-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-dotnet-ad53787" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-dotnet-ad537876/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-android -->
<add key="darc-pub-dotnet-android-01024bb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-01024bb6/nuget/v3/index.json" />
Expand Down Expand Up @@ -38,7 +38,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-int-dotnet-dotnet-b0f34d5-1" value="true" />
<add key="darc-int-dotnet-dotnet-ad53787" value="true" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-maui -->
<!-- End: Package sources from dotnet-maui -->
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.100">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100" Version="10.0.101">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
<Sha>ad537876ff853d0408608a6301378a4c3eb3ccf8</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-10.0.100" Version="10.0.100">
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-10.0.100" Version="10.0.101">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
<Sha>ad537876ff853d0408608a6301378a4c3eb3ccf8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100" Version="36.1.2">
<Uri>https://github.com/dotnet/android</Uri>
Expand All @@ -34,9 +34,9 @@
<Uri>https://github.com/dotnet/maui</Uri>
<Sha>9d881e94b1c56692e40a16262897677a3bb46fcb</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25523.112">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.101-servicing.25562.110">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
<Sha>ad537876ff853d0408608a6301378a4c3eb3ccf8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<VersionSDKMinor>1</VersionSDKMinor>
<!-- Use the feature version for each monthly servicng release -->
<!-- Use the patch version for intra-monthly releases and hotfixes -->
<VersionFeature>00</VersionFeature>
<VersionFeature>01</VersionFeature>
<VersionPatch>0</VersionPatch>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
Expand Down Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup Label="EmscriptenWorkloads">
<!-- Workloads from dotnet/sdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.100</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
Expand All @@ -61,8 +61,8 @@
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest100100PackageVersion)</XamarinTvOSWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup Label="MonoWorkloads">
<MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion>10.0.100</MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25523.112</MicrosoftNETSdkPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.101</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25562.110</MicrosoftNETSdkPackageVersion>
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MonoWorkloadManifestVersion>
<!-- mono workload prerelease version band must match the runtime feature band -->
Expand Down