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 @@ -4,7 +4,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-f7a0202" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-f7a02025/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-d4d18f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d4d18f3a/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26270.134</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26272.117</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.9</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.9</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.9</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.9</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.9</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.9</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.9</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.9-servicing.26270.134</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.9-servicing.26272.117</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.9</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.9</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26270.134</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.9-servicing.26272.117</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.9</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.9</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.9</SystemTextEncodingsWebPackageVersion>
Expand Down
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="f7a0202521a5bba40862d5999d43aedf45a65ab3" BarId="315339" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="d4d18f3a6b721b12a0589b26db5b9226f18447a1" BarId="315592" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.9-servicing.26270.134">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.9-servicing.26272.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26270.134">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.9-servicing.26272.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.9">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26270.134">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26272.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26270.134">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.26272.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26270.134">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26272.117">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f7a0202521a5bba40862d5999d43aedf45a65ab3</Sha>
<Sha>d4d18f3a6b721b12a0589b26db5b9226f18447a1</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
Expand Down
20 changes: 10 additions & 10 deletions eng/common/templates/steps/vmr-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ steps:
workingDirectory: ${{ parameters.vmrPath }}

- script: |
./eng/common/vmr-sync.sh \
--vmr ${{ parameters.vmrPath }} \
--tmp $(Agent.TempDirectory) \
--azdev-pat '$(dn-bot-all-orgs-code-r)' \
--ci \
./eng/common/vmr-sync.sh \
--vmr ${{ parameters.vmrPath }} \
--tmp $(Agent.TempDirectory) \
--azdev-pat '$(AzdoToken)' \
--ci \
--debug

if [ "$?" -ne 0 ]; then
Expand All @@ -67,11 +67,11 @@ steps:
condition: eq(variables['Agent.OS'], 'Windows_NT')

- powershell: |
./eng/common/vmr-sync.ps1 `
-vmr ${{ parameters.vmrPath }} `
-tmp $(Agent.TempDirectory) `
-azdevPat '$(dn-bot-all-orgs-code-r)' `
-ci `
./eng/common/vmr-sync.ps1 `
-vmr ${{ parameters.vmrPath }} `
-tmp $(Agent.TempDirectory) `
-azdevPat '$(AzdoToken)' `
-ci `
-debugOutput

if ($LASTEXITCODE -ne 0) {
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26270.134",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26270.134"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26272.117",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26272.117"
}
}
Loading