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: 4 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-baa6b29" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-baa6b294/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-19c0782" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-19c07820/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
Expand All @@ -40,8 +42,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-19c0782" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-baa6b29" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
72 changes: 35 additions & 37 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,16 @@ This file should be imported by eng/Versions.props
-->
<Project>
<PropertyGroup>
<!-- dotnet/sdk dependencies -->
<MicrosoftNETSdkPackageVersion>9.0.116-servicing.26153.6</MicrosoftNETSdkPackageVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftNETILLinkTasksPackageVersion>9.0.13</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.13</MicrosoftNETCoreAppRefPackageVersion>
<!-- _git/dotnet-aspnetcore dependencies -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.13</MicrosoftAspNetCoreAppRefPackageVersion>
<!-- dotnet/emsdk dependencies -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.13-servicing.26056.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<!-- dotnet/cecil dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
<!-- dotnet-aspnetcore dependencies -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
<!-- dotnet-cecil dependencies -->
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25628.2</MicrosoftDotNetCecilPackageVersion>
<!-- dotnet/macios dependencies -->
<!-- dotnet-emsdk dependencies -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.14-servicing.26110.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet80_170PackageVersion>17.0.8523</MicrosoftiOSSdknet80_170PackageVersion>
<MicrosoftiOSSdknet80_180PackageVersion>18.0.8324</MicrosoftiOSSdknet80_180PackageVersion>
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
Expand All @@ -32,31 +27,30 @@ This file should be imported by eng/Versions.props
<MicrosofttvOSSdknet80_170PackageVersion>17.0.8523</MicrosofttvOSSdknet80_170PackageVersion>
<MicrosofttvOSSdknet80_180PackageVersion>18.0.8324</MicrosofttvOSSdknet80_180PackageVersion>
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
<!-- dotnet/templating dependencies -->
<!-- dotnet-runtime dependencies -->
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.14</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.14</MicrosoftNETCoreAppRefPackageVersion>
<!-- dotnet-sdk dependencies -->
<MicrosoftNETSdkPackageVersion>9.0.116-servicing.26161.6</MicrosoftNETSdkPackageVersion>
<!-- dotnet-templating dependencies -->
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksPackageVersion>
<!-- dotnet/xharness dependencies -->
<!-- dotnet-xharness dependencies -->
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25466.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/sdk dependencies -->
<MicrosoftNETSdkVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETSdkVersion>
<!-- dotnet/runtime dependencies -->
<MicrosoftNETILLinkVersion>$(MicrosoftNETILLinkPackageVersion)</MicrosoftNETILLinkVersion>
<MicrosoftNETRuntimeMonoTargetsSdkVersion>$(MicrosoftNETRuntimeMonoTargetsSdkPackageVersion)</MicrosoftNETRuntimeMonoTargetsSdkVersion>
<!-- _git/dotnet-runtime dependencies -->
<MicrosoftNETILLinkTasksVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
<!-- _git/dotnet-aspnetcore dependencies -->
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetBuildTasksFeedVersion>$(MicrosoftDotNetBuildTasksFeedPackageVersion)</MicrosoftDotNetBuildTasksFeedVersion>
<!-- dotnet-aspnetcore dependencies -->
<MicrosoftAspNetCoreAppRefVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRefVersion>
<!-- dotnet/emsdk dependencies -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<!-- dotnet/cecil dependencies -->
<!-- dotnet-cecil dependencies -->
<MicrosoftDotNetCecilVersion>$(MicrosoftDotNetCecilPackageVersion)</MicrosoftDotNetCecilVersion>
<!-- dotnet/macios dependencies -->
<!-- dotnet-emsdk dependencies -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet80_170Version>$(MicrosoftiOSSdknet80_170PackageVersion)</MicrosoftiOSSdknet80_170Version>
<MicrosoftiOSSdknet80_180Version>$(MicrosoftiOSSdknet80_180PackageVersion)</MicrosoftiOSSdknet80_180Version>
<MicrosoftiOSSdknet90_180Version>$(MicrosoftiOSSdknet90_180PackageVersion)</MicrosoftiOSSdknet90_180Version>
Expand All @@ -69,12 +63,16 @@ This file should be imported by eng/Versions.props
<MicrosofttvOSSdknet80_170Version>$(MicrosofttvOSSdknet80_170PackageVersion)</MicrosofttvOSSdknet80_170Version>
<MicrosofttvOSSdknet80_180Version>$(MicrosofttvOSSdknet80_180PackageVersion)</MicrosofttvOSSdknet80_180Version>
<MicrosofttvOSSdknet90_180Version>$(MicrosofttvOSSdknet90_180PackageVersion)</MicrosofttvOSSdknet90_180Version>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetBuildTasksFeedVersion>$(MicrosoftDotNetBuildTasksFeedPackageVersion)</MicrosoftDotNetBuildTasksFeedVersion>
<!-- dotnet/templating dependencies -->
<!-- dotnet-runtime dependencies -->
<MicrosoftNETILLinkVersion>$(MicrosoftNETILLinkPackageVersion)</MicrosoftNETILLinkVersion>
<MicrosoftNETILLinkTasksVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETRuntimeMonoTargetsSdkVersion>$(MicrosoftNETRuntimeMonoTargetsSdkPackageVersion)</MicrosoftNETRuntimeMonoTargetsSdkVersion>
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
<!-- dotnet-sdk dependencies -->
<MicrosoftNETSdkVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETSdkVersion>
<!-- dotnet-templating dependencies -->
<MicrosoftTemplateEngineTasksVersion>$(MicrosoftTemplateEngineTasksPackageVersion)</MicrosoftTemplateEngineTasksVersion>
<!-- dotnet/xharness dependencies -->
<!-- dotnet-xharness dependencies -->
<MicrosoftDotNetXHarnessiOSSharedVersion>$(MicrosoftDotNetXHarnessiOSSharedPackageVersion)</MicrosoftDotNetXHarnessiOSSharedVersion>
</PropertyGroup>
</Project>
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.116-servicing.26153.6">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.116-servicing.26161.6">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>103e96de7dc1334427f643254f67aa8866a5a77a</Sha>
<Sha>f91b6d56aae550372467afbdeb7e7bd083731d24</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>9ecbfd4f3f330dc9649bce49cb12570b19d48c87</Sha>
<Sha>19c07820cb72aafc554c3bc8fe3c54010f5123f0</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>9ecbfd4f3f330dc9649bce49cb12570b19d48c87</Sha>
<Sha>19c07820cb72aafc554c3bc8fe3c54010f5123f0</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>087328de5f1e0067be48d87295ae8d92064a1535</Sha>
<Sha>baa6b294e728e6171378b4e8c52e42e7c4d4ed63</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.13-servicing.26056.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.14-servicing.26110.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>8f9e359ad95f422aec3c31c21ab188166f655842</Sha>
<Sha>fb1326b0f4622f04f21584dc133f1c71f7554509</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25628.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "9.0.116-servicing.26153.6"
"version": "9.0.116-servicing.26161.6"
},
"tools": {
"dotnet": "9.0.116-servicing.26153.6"
"dotnet": "9.0.116-servicing.26161.6"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4"
Expand Down
Loading