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

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

Merged
merged 12 commits into from
Mar 11, 2019
Merged

Bump target frameworks of C# programs from netcoreapp1.0 to netcoreapp2.1 #5838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d96bec2
Bump target frameworks from netcoreapp1.0 to netcoreapp2.2.
ObsidianMinor Mar 5, 2019
5808f00
Re-add curl install
ObsidianMinor Mar 6, 2019
ad28622
Change all exe target to 2.1
ObsidianMinor Mar 6, 2019
afae499
Fix incorrect versions in global.json and Dockerfile
ObsidianMinor Mar 6, 2019
e4dc27d
Downgrade version to 2.1 to match exe targets
ObsidianMinor Mar 6, 2019
c24ec68
introduce separate testing Dockerfile for C#
jtattermusch Mar 6, 2019
7d246f6
revert changes to the shared Dockerfile
jtattermusch Mar 6, 2019
b2e8f97
use netcoreapp2.1 for C# conformance tests
jtattermusch Mar 6, 2019
dfb873a
use language specific dockerfile for testing C#
jtattermusch Mar 6, 2019
0efbd9a
Edit compatibility tests script to use parameters instead of file copies
ObsidianMinor Mar 8, 2019
5e3e9fb
install dotnet SDK on windows before running the tests
jtattermusch Mar 11, 2019
da2db2a
update csharp_EXTRA_DIST
jtattermusch Mar 11, 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
2 changes: 1 addition & 1 deletion conformance/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ conformance-java-lite: javac_middleman_lite
conformance-csharp: $(other_language_protoc_outputs)
@echo "Writing shortcut script conformance-csharp..."
@echo '#! /bin/sh' > conformance-csharp
@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp1.0/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp
@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp2.1/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why do we call the dll directly instead of dotnet run --no-build?

Copy link
Contributor

Choose a reason for hiding this comment

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

I personally feel more confident that this will really only run the pre-built dll as opposed to to running a dotnet command that can potentially do something extra. No reason to change this in this PR.

@chmod +x conformance-csharp

conformance-php:
Expand Down
2 changes: 1 addition & 1 deletion csharp/compatibility_tests/v3.0.0/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function run_test() {
dotnet restore src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
dotnet build -c Release src/Google.Protobuf/Google.Protobuf.csproj
dotnet build -c Release src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
dotnet run -c Release -f netcoreapp1.0 -p src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
dotnet run -c Release -f netcoreapp2.1 -p src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
}

set -ex
Expand Down