Skip to content

Merge master to release/dev16.3 #7159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 4 commits into from
Jul 9, 2019
Merged

Merge master to release/dev16.3 #7159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a63be48
Update dependencies from https://github.com/dotnet/arcade build 20190…
Jul 5, 2019
8bfca24
Update dependencies from https://github.com/dotnet/arcade build 20190…
Jul 6, 2019
f2e9ed1
Update dependencies from https://github.com/dotnet/arcade build 20190…
Jul 7, 2019
77b5521
Merge pull request #7143 from dotnet/darc-master-8f1390e2-a78f-411e-b…
KevinRansom Jul 7, 2019
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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/arcade build 20190… 
…706.1

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19356.1
  • Loading branch information
dotnet-maestro committed Jul 7, 2019
commit f2e9ed1f010a5d0dbc31c5fe0811e3c5f8f80a1f
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19355.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19356.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3e0cbbc6fd6c6d45d7083ee0deb71cec7ea2d91f</Sha>
<Sha>a65d0966dc28861394ce78cfdcb9d5dff370957c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19355.2",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19356.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
}
}