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
2 changes: 1 addition & 1 deletion 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-pub-dotnet-dotnet-4ef9fba" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4ef9fba1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-fe158d9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-fe158d96/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--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" />
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildPackageVersion>18.0.10</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.10</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26057.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.103-servicing.26057.111</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26064.114</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.103-servicing.26064.114</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.3</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.3</MicrosoftNETCoreILDAsmPackageVersion>
</PropertyGroup>
Expand Down
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="4ef9fba1ed958b047163527960c27baf2883f835" BarId="296350" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="fe158d9692179d1316d11bf67b264c4509176f7e" BarId="297370" />
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="18.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.10">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26057.111">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26064.114">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.103-servicing.26057.111">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.103-servicing.26064.114">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.3">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.3">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4ef9fba1ed958b047163527960c27baf2883f835</Sha>
<Sha>fe158d9692179d1316d11bf67b264c4509176f7e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.111"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26064.114"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
The MIT License (MIT)

Copyright (c) .NET Foundation and Contributors

All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageVersion>36.1.2</PackageVersion>
<AssemblyName>Microsoft.NET.Sdk.Android.Manifest-10.0.100</AssemblyName>
</PropertyGroup>

</Project>
Loading