Skip to content
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

Jump to bottom

UTY-2646: update dependencies.pinned #80

Merged
merged 14 commits into from
Aug 7, 2020
Merged

UTY-2646: update dependencies.pinned #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9be433e
update dependencies.pinned
BryanJY-Wong Jul 29, 2020
a8b03b2
update csproj target framework
BryanJY-Wong Jul 30, 2020
ef970fa
add dotnet 2.2
BryanJY-Wong Jul 30, 2020
16e9923
update dockerfiles
BryanJY-Wong Jul 31, 2020
b97c5d4
change copy builddir
BryanJY-Wong Jul 31, 2020
5c45c93
switching to alpine seems to work
BryanJY-Wong Jul 31, 2020
58bf17c
alpine doesn't work, trying bionic
BryanJY-Wong Jul 31, 2020
5728864
:( forgot to change back to apt-get
BryanJY-Wong Jul 31, 2020
b5ecf21
T_T
BryanJY-Wong Jul 31, 2020
69c7ae8
standardise docker images
BryanJY-Wong Jul 31, 2020
1c2006b
screw it
BryanJY-Wong Jul 31, 2020
dfb7b18
[skip-ci] Try non bionic build
BryanJY-Wong Aug 3, 2020
84615b0
Update ci/docker/release-tool.Dockerfile
BryanJY-Wong Aug 4, 2020
be8e68d
pin language version to 8.0
BryanJY-Wong Aug 5, 2020
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 ci/docker/lint/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk
FROM mcr.microsoft.com/dotnet/core/sdk:3.1

# Install the linting tool
RUN dotnet tool install --global --version 3.3.111304 dotnet-format
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/premerge.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk as build
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build
WORKDIR /app
COPY ./tools ./tools/
COPY ./ci/docker/entrypoint.sh ./entrypoint.sh
Expand Down
7 changes: 4 additions & 3 deletions ci/docker/release-tool.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM microsoft/dotnet:2.2-sdk as build
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build

# Copy everything and build
WORKDIR /app
COPY ./tools ./
RUN dotnet publish -c Release -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/core/runtime:2.2
# Requires the bionic image due to runtime requirements of the libgit2sharp library
FROM mcr.microsoft.com/dotnet/core/runtime:3.1-bionic
BryanJY-Wong marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /app
COPY --from=build /app/*/out ./
COPY --from=build /app/out ./

# Setup GIT
RUN apt-get update && \
Expand Down
7 changes: 4 additions & 3 deletions dependencies.pinned
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
win/dotnet-sdk-3.1.101.exe https://download.visualstudio.microsoft.com/download/pr/854ca330-4414-4141-9be8-5da3c4be8d04/3792eafd60099b3050313f2edfd31805/dotnet-sdk-3.1.101-win-x64.exe
macos/dotnet-sdk-3.1.101.pkg https://download.visualstudio.microsoft.com/download/pr/749db4bc-73c3-4ffb-a545-c315dc9a0ca8/5281258f5dcae636efe557b8b305e20b/dotnet-sdk-3.1.101-osx-x64.pkg
linux/dotnet-sdk-3.101.tar.gz https://download.visualstudio.microsoft.com/download/pr/c4b503d6-2f41-4908-b634-270a0a1dcfca/c5a20e42868a48a2cd1ae27cf038044c/dotnet-sdk-3.1.101-linux-x64.tar.gz
win/dotnet-sdk-3.1.302.exe https://download.visualstudio.microsoft.com/download/pr/56b00a71-686f-4f27-9ad1-9b30308688ed/1fa023326e475813783a240532c9f2c8/dotnet-sdk-3.1.302-win-x64.exe
macos/dotnet-sdk-3.1.302.pkg https://download.visualstudio.microsoft.com/download/pr/fff497aa-e6f6-4556-b67b-d139e772156f/4efa99b6bf0cb59104920dfd5f65f8a8/dotnet-sdk-3.1.302-osx-x64.pkg
linux/dotnet-sdk-3.1.302.tar.gz https://download.visualstudio.microsoft.com/download/pr/c1a30ceb-adc2-4244-b24a-06ca29bb1ee9/6df5d856ff1b3e910d283f89690b7cae/dotnet-sdk-3.1.302-linux-x64.tar.gz
win/dotnet-sdk-2.2.402.exe https://download.visualstudio.microsoft.com/download/pr/40c1dd82-671c-4974-919d-ac8a61ef5a91/49ab67c335878f4a5bdd84e14c76708f/dotnet-sdk-2.2.402-win-x64.exe
2 changes: 1 addition & 1 deletion tools/PackageSymLinker/PackageSymLinker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tools/ReleaseTool.Tests/ReleaseTool.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>

<TargetFramework>netcoreapp3.1</TargetFramework>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zeroZshadow do we want to pin the lang version in all of these too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice. I already saw that some were set to 7.3 and some 7.2

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 to pinning lang versions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could stay on 7.3? If we need C#8 features we can update as/when needed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Equally 8 is fully backwards compatible with 7.3, so its not like choosing 8 has any downsides for us

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's true

<LangVersion>8.0</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion tools/ReleaseTool/ReleaseTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<ApplicationIcon />
<StartupObject>ReleaseTool.EntryPoint</StartupObject>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion tools/RunUnity/RunUnity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<StartupObject>RunUnity.Program</StartupObject>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion tools/UnityPaths/UnityPaths.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

</Project>