Skip to content

Commit

Permalink
Stop using VersionPrefix and then a suffix
Browse files Browse the repository at this point in the history
We don't do this in google-cloud-dotnet, and it's basically a leftover from MyGet days
  • Loading branch information
jskeet committed Nov 7, 2018
1 parent 40c1ffc commit 013ad07
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Google.Api.CommonProtos/Google.Api.CommonProtos.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\CommonProperties.Production.xml" />

<PropertyGroup>
<VersionPrefix>1.4.0</VersionPrefix>
<Version>1.4.0</Version>
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion ReleaseVersion.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
- divergent versions, but for the moment this keeps things simpler.
-->
<PropertyGroup>
<VersionPrefix>2.5.0</VersionPrefix>
<Version>2.5.0</Version>
</PropertyGroup>
</Project>
19 changes: 0 additions & 19 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

set -e

# Myget has sometimes used caps and sometimes not for
# its environment variables...
if [ -n "$PrereleaseTag" -a -z "$PRERELEASETAG" ]
then
PRERELEASETAG="$PrereleaseTag"
fi

# Clean up previous builds
rm -rf {src,test,testing}/*/bin {src,test,testing}/*/obj

Expand All @@ -18,18 +11,6 @@ DOTNET_BUILD_ARGS="-c $CONFIG"
# Arguments to use for test-related commands (test)
DOTNET_TEST_ARGS="--no-build $DOTNET_BUILD_ARGS"

# Three options:
# - No environment variables: make sure it's not for release
# - PRERELEASETAG set: use that
# - NOVERSIONSUFFIX set: use no suffix; build as per project.json
if [ -n "$PRERELEASETAG" ]
then
DOTNET_BUILD_ARGS="$DOTNET_BUILD_ARGS --version-suffix $PRERELEASETAG"
elif [ -z "$NOVERSIONSUFFIX" ]
then
DOTNET_BUILD_ARGS="$DOTNET_BUILD_ARGS --version-suffix dont-release"
fi

echo CLI args: $DOTNET_BUILD_ARGS

echo Restoring
Expand Down
1 change: 0 additions & 1 deletion buildrelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ git clone https://github.com/googleapis/gax-dotnet.git releasebuild -c core.auto
cd releasebuild
git checkout $tag
export CI=true # Forces SourceLink in the main build.
export NOVERSIONSUFFIX=true
./build.sh
dotnet pack Gax.sln --no-build -o $PWD/nuget -c Release

Expand Down

0 comments on commit 013ad07

Please sign in to comment.