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
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +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-pub-dotnet-dotnet-1297628" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-12976281/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-android -->
<!-- End: Package sources from dotnet-android -->
Expand Down
16 changes: 8 additions & 8 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-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.final">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
<Sha>129762816df93ca3a56a666de5f619d0de412ec7</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.0-preview.2.final">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
<Sha>129762816df93ca3a56a666de5f619d0de412ec7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.2" Version="36.1.99-preview.2.154">
<Uri>https://github.com/dotnet/android</Uri>
Expand All @@ -34,15 +34,15 @@
<Uri>https://github.com/dotnet/maui</Uri>
<Sha>8151668ee5299645694a934cc0f706d403bd64b0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.2.26159.112">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.2.26161.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
<Sha>129762816df93ca3a56a666de5f619d0de412ec7</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26159.112">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26161.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
<Sha>129762816df93ca3a56a666de5f619d0de412ec7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup Label="EmscriptenWorkloads">
<!-- Workloads from dotnet/sdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.final</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview2PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
Expand All @@ -60,8 +60,8 @@
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview2PackageVersion)</XamarinTvOSWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup Label="MonoWorkloads">
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETSdkPackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.0-preview.2.final</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.2.26161.107</MicrosoftNETSdkPackageVersion>
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview2PackageVersion)</MonoWorkloadManifestVersion>
<!-- mono workload prerelease version band must match the runtime feature band -->
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ steps:
# YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
# we can avoid including the MB install step if not enabled at all. This avoids a bunch of
# extra pipeline authorizations, since most pipelines do not sign on non-Windows.
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand All @@ -95,7 +95,7 @@ steps:
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))

- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26159.112",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26161.107",
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
}
}