Merge pull request #827 from xPaw/protobufs2

Update protobufs

Resources/ProtobufGen/ProtobufGen/ProtobufGen.csproj

@@ -2,7 +2,9 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RollForward>LatestMajor</RollForward>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

Resources/ProtobufGen/generate-all.ps1

@@ -12,7 +12,7 @@
 param([string[]]$ProtoDir)
 
 $ProtoGenSrc = Join-Path $PSScriptRoot 'ProtobufGen'
-$ProtoGenDll = Join-Path $ProtoGenSrc '\bin\Debug\netcoreapp2.1\ProtobufGen.dll'
+$ProtoGenDll = Join-Path $ProtoGenSrc '\bin\Debug\ProtobufGen.dll'
 $ProtoBase = Join-Path $PSScriptRoot '..\ProtoBufs'
 $SK2Base = Join-Path $PSScriptRoot '..\..\SteamKit2\SteamKit2\Base\Generated'
 

Resources/ProtobufGen/protos.csv

@@ -1,42 +1,42 @@
 ProtoDir,ProtoFileName,ClassFilePath,Namespace
 steam,content_manifest.proto,ContentManifest.cs,SteamKit2.Internal
 steam,encrypted_app_ticket.proto,SteamMsgAppTicket.cs,SteamKit2.Internal
-steam,steammessages_accounthardware.steamclient.proto,Unified\SteamMsgAccountHardware.cs,SteamKit2.Unified.Internal
+steam,steammessages_accounthardware.steamclient.proto,SteamMsgAccountHardware.cs,SteamKit2.Internal
 steam,steammessages_base.proto,SteamMsgBase.cs,SteamKit2.Internal
-steam,steammessages_broadcast.steamclient.proto,Unified\SteamMsgBroadcast.cs,SteamKit2.Unified.Internal
-steam,steammessages_chat.steamclient.proto,Unified\SteamMsgChat.cs,SteamKit2.Unified.Internal
+steam,steammessages_broadcast.steamclient.proto,SteamMsgBroadcast.cs,SteamKit2.Internal
+steam,steammessages_chat.steamclient.proto,SteamMsgChat.cs,SteamKit2.Internal
 steam,steammessages_clientserver.proto,SteamMsgClientServer.cs,SteamKit2.Internal
 steam,steammessages_clientserver_2.proto,SteamMsgClientServer2.cs,SteamKit2.Internal
 steam,steammessages_clientserver_friends.proto,SteamMsgClientServerFriends.cs,SteamKit2.Internal
 steam,steammessages_clientserver_login.proto,SteamMsgClientServerLogin.cs,SteamKit2.Internal
-steam,steammessages_cloud.steamclient.proto,Unified\SteamMsgCloud.cs,SteamKit2.Unified.Internal
-steam,steammessages_credentials.steamclient.proto,Unified\SteamMsgCredentials.cs,SteamKit2.Unified.Internal
-steam,steammessages_datapublisher.steamclient.proto,Unified\SteamMsgDataPublisher.cs,SteamKit2.Unified.Internal
-steam,steammessages_depotbuilder.steamclient.proto,Unified\SteamMsgDepotBuilder.cs,SteamKit2.Unified.Internal
-steam,steammessages_deviceauth.steamclient.proto,Unified\SteamMsgDeviceAuth.cs,SteamKit2.Unified.Internal
-steam,steammessages_econ.steamclient.proto,Unified\SteamMsgEcon.cs,SteamKit2.Unified.Internal
-steam,steammessages_friendmessages.steamclient.proto,Unified\SteamMsgFriendMessages.cs,SteamKit2.Unified.Internal
-steam,steammessages_gamenotifications.steamclient.proto,Unified\SteamMsgGameNotifications.cs,SteamKit2.Unified.Internal
-steam,steammessages_gameservers.steamclient.proto,Unified\SteamMsgGameServers.cs,SteamKit2.Unified.Internal
-steam,steammessages_inventory.steamclient.proto,Unified\SteamMsgInventory.cs,SteamKit2.Unified.Internal
-steam,steammessages_linkfilter.steamclient.proto,Unified\SteamMsgLinkFilter.cs,SteamKit2.Unified.Internal
-steam,steammessages_market.steamclient.proto,Unified\SteamMsgMarket.cs,SteamKit2.Unified.Internal
-steam,steammessages_offline.steamclient.proto,Unified\SteamMsgOffline.cs,SteamKit2.Unified.Internal
-steam,steammessages_parental.steamclient.proto,Unified\SteamMsgParental.cs,SteamKit2.Unified.Internal
-steam,steammessages_parties.steamclient.proto,Unified\SteamMsgParties.cs,SteamKit2.Unified.Internal
-steam,steammessages_partnerapps.steamclient.proto,Unified\SteamMsgPartnerApps.cs,SteamKit2.Unified.Internal
-steam,steammessages_player.steamclient.proto,Unified\SteamMsgPlayer.cs,SteamKit2.Unified.Internal
-steam,steammessages_publishedfile.steamclient.proto,Unified\SteamMsgPublishedFile.cs,SteamKit2.Unified.Internal
-steam,steammessages_qms.steamclient.proto,Unified\SteamMsgQMS.cs,SteamKit2.Unified.Internal
-steam,steammessages_secrets.steamclient.proto,Unified\SteamMsgSecrets.cs,SteamKit2.Unified.Internal
-steam,steammessages_shader.steamclient.proto,Unified\SteamMsgShader.cs,SteamKit2.Unified.Internal
-steam,steammessages_site_license.steamclient.proto,Unified\SteamMsgSiteLicense.cs,SteamKit2.Unified.Internal
+steam,steammessages_cloud.steamclient.proto,SteamMsgCloud.cs,SteamKit2.Internal
+steam,steammessages_credentials.steamclient.proto,SteamMsgCredentials.cs,SteamKit2.Internal
+steam,steammessages_datapublisher.steamclient.proto,SteamMsgDataPublisher.cs,SteamKit2.Internal
+steam,steammessages_depotbuilder.steamclient.proto,SteamMsgDepotBuilder.cs,SteamKit2.Internal
+steam,steammessages_deviceauth.steamclient.proto,SteamMsgDeviceAuth.cs,SteamKit2.Internal
+steam,steammessages_econ.steamclient.proto,SteamMsgEcon.cs,SteamKit2.Internal
+steam,steammessages_friendmessages.steamclient.proto,SteamMsgFriendMessages.cs,SteamKit2.Internal
+steam,steammessages_gamenotifications.steamclient.proto,SteamMsgGameNotifications.cs,SteamKit2.Internal
+steam,steammessages_gameservers.steamclient.proto,SteamMsgGameServers.cs,SteamKit2.Internal
+steam,steammessages_inventory.steamclient.proto,SteamMsgInventory.cs,SteamKit2.Internal
+steam,steammessages_linkfilter.steamclient.proto,SteamMsgLinkFilter.cs,SteamKit2.Internal
+steam,steammessages_market.steamclient.proto,SteamMsgMarket.cs,SteamKit2.Internal
+steam,steammessages_offline.steamclient.proto,SteamMsgOffline.cs,SteamKit2.Internal
+steam,steammessages_parental.steamclient.proto,SteamMsgParental.cs,SteamKit2.Internal
+steam,steammessages_parties.steamclient.proto,SteamMsgParties.cs,SteamKit2.Internal
+steam,steammessages_partnerapps.steamclient.proto,SteamMsgPartnerApps.cs,SteamKit2.Internal
+steam,steammessages_player.steamclient.proto,SteamMsgPlayer.cs,SteamKit2.Internal
+steam,steammessages_publishedfile.steamclient.proto,SteamMsgPublishedFile.cs,SteamKit2.Internal
+steam,steammessages_qms.steamclient.proto,SteamMsgQMS.cs,SteamKit2.Internal
+steam,steammessages_secrets.steamclient.proto,SteamMsgSecrets.cs,SteamKit2.Internal
+steam,steammessages_shader.steamclient.proto,SteamMsgShader.cs,SteamKit2.Internal
+steam,steammessages_site_license.steamclient.proto,SteamMsgSiteLicense.cs,SteamKit2.Internal
 steam,steammessages_sitelicenseclient.proto,SteamMsgSiteLicenseClient.cs,SteamKit2.Internal
-steam,steammessages_store.steamclient.proto,Unified\SteamMsgStore.cs,SteamKit2.Unified.Internal
-steam,steammessages_twofactor.steamclient.proto,Unified\SteamMsgTwoFactor.cs,SteamKit2.Unified.Internal
-steam,steammessages_unified_base.steamclient.proto,Unified\SteamMsgUnifiedBase.cs,SteamKit2.Unified.Internal
-steam,steammessages_useraccount.steamclient.proto,Unified\SteamMsgUserAccount.cs,SteamKit2.Unified.Internal
-steam,steammessages_video.steamclient.proto,Unified\SteamMsgVideo.cs,SteamKit2.Unified.Internal
+steam,steammessages_store.steamclient.proto,SteamMsgStore.cs,SteamKit2.Internal
+steam,steammessages_twofactor.steamclient.proto,SteamMsgTwoFactor.cs,SteamKit2.Internal
+steam,steammessages_unified_base.steamclient.proto,SteamMsgUnifiedBase.cs,SteamKit2.Internal
+steam,steammessages_useraccount.steamclient.proto,SteamMsgUserAccount.cs,SteamKit2.Internal
+steam,steammessages_video.steamclient.proto,SteamMsgVideo.cs,SteamKit2.Internal
 artifact,base_gcmessages.proto,GC\Artifact\SteamMsgGC.cs,SteamKit2.GC.Artifact.Internal
 artifact,dcg_gcmessages_client.proto,GC\Artifact\MsgGCClient.cs,SteamKit2.GC.Artifact.Internal
 artifact,dcg_gcmessages_common.proto,GC\Artifact\MsgGCCommon.cs,SteamKit2.GC.Artifact.Internal
@@ -75,7 +75,7 @@ dota2,gcsdk_gcmessages.proto,GC\Dota\SteamMsgGCSDK.cs,SteamKit2.GC.Dota.Internal
 dota2,gcsystemmsgs.proto,GC\Dota\SteamMsgGCSystem.cs,SteamKit2.GC.Dota.Internal
 dota2,network_connection.proto,GC\Dota\NetworkConnection.cs,SteamKit2.GC.Dota.Internal
 dota2,steammessages.proto,GC\Dota\SteamMsgBase.cs,SteamKit2.GC.Dota.Internal
-dota2,steammessages_oauth.steamworkssdk.proto,Unified\Steamworks\SteamMsgOAuthSteamworks.cs,SteamKit2.Unified.Internal.Steamworks
+dota2,steammessages_oauth.steamworkssdk.proto,Steamworks\SteamMsgOAuthSteamworks.cs,SteamKit2.Internal.Steamworks
 tf2,base_gcmessages.proto,GC\TF2\SteamMsgGC.cs,SteamKit2.GC.TF2.Internal
 tf2,econ_gcmessages.proto,GC\TF2\SteamMsgGCEcon.cs,SteamKit2.GC.TF2.Internal
 tf2,gcsdk_gcmessages.proto,GC\TF2\SteamMsgGCSDK.cs,SteamKit2.GC.TF2.Internal

Samples/8.UnifiedMessages/Program.cs

@@ -1,7 +1,7 @@
 using System;
 
 using SteamKit2;
-using SteamKit2.Unified.Internal;
+using SteamKit2.Internal;
 
 //
 // Sample 8: Unified Messages
@@ -132,7 +132,7 @@ static void OnLoggedOn( SteamUser.LoggedOnCallback callback )
 
             // now that we're logged onto Steam, lets query the IPlayer service for our badge levels
 
-            // first, build our request object, these are autogenerated and can normally be found in the SteamKit2.Unified.Internal namespace
+            // first, build our request object, these are autogenerated and can normally be found in the SteamKit2.Internal namespace
             CPlayer_GetGameBadgeLevels_Request req = new CPlayer_GetGameBadgeLevels_Request
             {
                 // we want to know our 440 (TF2) badge level

SteamKit2/SteamKit2/Base/Generated/ContentManifest.cs

@@ -311,6 +311,17 @@ public ulong manifest_id_target
         [global::ProtoBuf.ProtoMember(4)]
         public global::System.Collections.Generic.List<DeltaChunk> deltaChunks { get; } = new global::System.Collections.Generic.List<DeltaChunk>();
 
+        [global::ProtoBuf.ProtoMember(5)]
+        [global::System.ComponentModel.DefaultValue(EContentDeltaChunkDataLocation.k_EContentDeltaChunkDataLocationInProtobuf)]
+        public EContentDeltaChunkDataLocation chunk_data_location
+        {
+            get { return __pbn__chunk_data_location ?? EContentDeltaChunkDataLocation.k_EContentDeltaChunkDataLocationInProtobuf; }
+            set { __pbn__chunk_data_location = value; }
+        }
+        public bool ShouldSerializechunk_data_location() => __pbn__chunk_data_location != null;
+        public void Resetchunk_data_location() => __pbn__chunk_data_location = null;
+        private EContentDeltaChunkDataLocation? __pbn__chunk_data_location;
+
         [global::ProtoBuf.ProtoContract()]
         public partial class DeltaChunk : global::ProtoBuf.IExtensible
         {
@@ -368,10 +379,27 @@ public byte[] chunk
             public void Resetchunk() => __pbn__chunk = null;
             private byte[] __pbn__chunk;
 
+            [global::ProtoBuf.ProtoMember(6)]
+            public uint size_delta
+            {
+                get { return __pbn__size_delta.GetValueOrDefault(); }
+                set { __pbn__size_delta = value; }
+            }
+            public bool ShouldSerializesize_delta() => __pbn__size_delta != null;
+            public void Resetsize_delta() => __pbn__size_delta = null;
+            private uint? __pbn__size_delta;
+
         }
 
     }
 
+    [global::ProtoBuf.ProtoContract()]
+    public enum EContentDeltaChunkDataLocation
+    {
+        k_EContentDeltaChunkDataLocationInProtobuf = 0,
+        k_EContentDeltaChunkDataLocationAfterProtobuf = 1,
+    }
+
 }
 
 #pragma warning restore CS0612, CS1591, CS3021, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192

SteamKit2/SteamKit2/Base/Generated/GC/CSGO/MsgGC.cs

@@ -2932,6 +2932,16 @@ public uint seconds
         public void Resetseconds() => __pbn__seconds = null;
         private uint? __pbn__seconds;
 
+        [global::ProtoBuf.ProtoMember(4)]
+        public bool communication_cooldown
+        {
+            get { return __pbn__communication_cooldown.GetValueOrDefault(); }
+            set { __pbn__communication_cooldown = value; }
+        }
+        public bool ShouldSerializecommunication_cooldown() => __pbn__communication_cooldown != null;
+        public void Resetcommunication_cooldown() => __pbn__communication_cooldown = null;
+        private bool? __pbn__communication_cooldown;
+
     }
 
     [global::ProtoBuf.ProtoContract()]
@@ -3021,6 +3031,16 @@ public ulong match_id
         public void Resetmatch_id() => __pbn__match_id = null;
         private ulong? __pbn__match_id;
 
+        [global::ProtoBuf.ProtoMember(9)]
+        public bool report_from_demo
+        {
+            get { return __pbn__report_from_demo.GetValueOrDefault(); }
+            set { __pbn__report_from_demo = value; }
+        }
+        public bool ShouldSerializereport_from_demo() => __pbn__report_from_demo != null;
+        public void Resetreport_from_demo() => __pbn__report_from_demo = null;
+        private bool? __pbn__report_from_demo;
+
     }
 
     [global::ProtoBuf.ProtoContract()]

SteamKit2/SteamKit2/Base/Generated/GC/CSGO/SteamMsgGCEcon.cs

@@ -351,6 +351,8 @@ public enum EGCItemCustomizationNotification
         k_EGCItemCustomizationNotification_RemoveSticker = 1053,
         k_EGCItemCustomizationNotification_ApplySticker = 1086,
         k_EGCItemCustomizationNotification_StatTrakSwap = 1088,
+        k_EGCItemCustomizationNotification_RemovePatch = 1089,
+        k_EGCItemCustomizationNotification_ApplyPatch = 1090,
         k_EGCItemCustomizationNotification_ActivateFanToken = 9178,
         k_EGCItemCustomizationNotification_ActivateOperationCoin = 9179,
         k_EGCItemCustomizationNotification_GraffitiUnseal = 9185,